From 5d29ed1801a07d4649e095c25935b50f5ad32eb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Tue, 26 Jan 2016 14:46:49 +0000 Subject: Resolves: tdf#97331 use VclPtr instead of pointers to avoid crash Change-Id: Ia653a67046cb2cfb7c96367a7483ddc0cb29819e --- vcl/source/window/winproc.cxx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'vcl/source') diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index 9e9a7fcd050b..e484f7d46511 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -1314,7 +1314,7 @@ static bool ImplCallWheelCommand( const VclPtr& pWindow, const Poin static bool acceptableWheelScrollTarget(const vcl::Window *pMouseWindow) { - return (pMouseWindow && pMouseWindow->IsInputEnabled() && !pMouseWindow->IsInModalMode()); + return (pMouseWindow && !pMouseWindow->isDisposed() && pMouseWindow->IsInputEnabled() && !pMouseWindow->IsInModalMode()); } //If the last event at the same absolute screen position was handled by a @@ -1480,26 +1480,26 @@ public: bool HandleWheelEvent::HandleEvent(const SalWheelMouseEvent& rEvt) { static SalWheelMouseEvent aPreviousEvent; - static vcl::Window *pPreviousWindow; + static VclPtr xPreviousWindow; if (!Setup()) return false; - vcl::Window *pMouseWindow = FindTarget(); + VclPtr xMouseWindow = FindTarget(); // avoid the problem that scrolling via wheel to this point brings a widget // under the mouse that also accepts wheel commands, so stick with the old // widget if the time gap is very small - if (shouldReusePreviousMouseWindow(aPreviousEvent, rEvt) && acceptableWheelScrollTarget(pPreviousWindow)) + if (shouldReusePreviousMouseWindow(aPreviousEvent, rEvt) && acceptableWheelScrollTarget(xPreviousWindow)) { - pMouseWindow = pPreviousWindow; + xMouseWindow = xPreviousWindow.get(); } aPreviousEvent = rEvt; - pPreviousWindow = Dispatch(pMouseWindow); + xPreviousWindow = Dispatch(xMouseWindow); - return pPreviousWindow != nullptr; + return xPreviousWindow; } class HandleGestureEvent : public HandleGestureEventBase -- cgit v1.2.1