diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2017-01-06 15:23:30 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-01-09 14:32:53 +0000 |
| commit | 62b77a31119c23a8617e161a2d4f4d4e1e97eb2c (patch) | |
| tree | 1cb883ebfd19d1b3676db7e1b3b7dc06e7ec6872 | |
| parent | 017991fac36433fb909de83cad63b5ed98b71acf (diff) | |
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@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
(cherry picked from commit d788d37a16d382d7ff32a19e8d65e5c605ac55dd)
Reviewed-on: https://gerrit.libreoffice.org/32819
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | vcl/source/window/window2.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx index 79ae5c5425d9..5d427ccddb70 100644 --- a/vcl/source/window/window2.cxx +++ b/vcl/source/window/window2.cxx @@ -371,7 +371,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 ); } } } |