diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2017-01-06 15:23:30 +0000 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2017-01-12 16:09:14 +0000 |
| commit | 16867471ffdb4742c18d6a04ceacd66e8f33dfa6 (patch) | |
| tree | e2cacfdecdd69c78bf76b9f32039810c78f2e75a /vcl | |
| parent | 771fad2dfe556a5c47ccd5e987fc304350600557 (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/32789
Reviewed-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'vcl')
| -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 9e42f3ce36e3..24d1fa79eae2 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 ); } } } |