summaryrefslogtreecommitdiff
path: root/vcl/source/window
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2017-01-06 15:23:30 +0000
committerAshod Nakashian <ashnakash@gmail.com>2017-01-07 16:17:13 +0000
commit3d24da12c271c2a5aa60325bc33b733f17397207 (patch)
tree6aab02facfada6adc3b56cfb77cc35031b69a114 /vcl/source/window
parent316137a3e2ff62eecfe965da397a5886bf389100 (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/32790 Reviewed-by: Ashod Nakashian <ashnakash@gmail.com> Tested-by: Ashod Nakashian <ashnakash@gmail.com>
Diffstat (limited to 'vcl/source/window')
-rw-r--r--vcl/source/window/window2.cxx6
1 files changed, 5 insertions, 1 deletions
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 45368093be5f..dd0d85684d99 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 );
}
}
}