[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - vcl/source

[Michael Meeks]

 vcl/source/window/window2.cxx |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 16867471ffdb4742c18d6a04ceacd66e8f33dfa6
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Fri Jan 6 15:23:30 2017 +0000

    tdf#105151 - be more conservative about EndTracking / Tracking calls.
    
    We really shouldn't be emitting these into widgets after they are
    disposed - it serves only to confuse things. Restore behaviour to how
    it was before the VclPtr change for this.
    
    Change-Id: Ife666929f8aac0e4431a5e43970769692c11888c
    Reviewed-on: https://gerrit.libreoffice.org/32785
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    (cherry picked from commit d788d37a16d382d7ff32a19e8d65e5c605ac55dd)
    Reviewed-on: https://gerrit.libreoffice.org/32789
    Reviewed-by: Eike Rathke <erack at redhat.com>

diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 9e42f3c..24d1fa7 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -365,7 +365,11 @@ void Window::EndTracking( TrackingEventFlags nFlags )
                                    mpWindowImpl->mpFrameData->mnMouseCode,
                                    mpWindowImpl->mpFrameData->mnMouseCode );
             TrackingEvent   aTEvt( aMEvt, nFlags | TrackingEventFlags::End );
-            Tracking( aTEvt );
+            // CompatTracking effectively
+            if (!mpWindowImpl || mpWindowImpl->mbInDispose)
+                return Window::Tracking( aTEvt );
+            else
+                return Tracking( aTEvt );
         }
     }
 }