summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2017-03-01 15:13:19 +0000
committerAndras Timar <andras.timar@collabora.com>2017-03-06 16:08:00 +0100
commit007e060c569ab87f89096cab32fbd7fd336e18c7 (patch)
treea08283508d01bb6843974878d0f91705e87580cb
parent77d6732e1bc58588c9f8be84e70e34e68dbcb62b (diff)
Tolerate mouse move generation on disposed windows.
http://crashreport.libreoffice.org/stats/crash_details/524d28fb-4fd2-4d11-83b1-1360b5ab5068 Change-Id: I19a13f751b5cf000c9938ff991d7d44bba0a4de7 Reviewed-on: https://gerrit.libreoffice.org/34756 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com> (cherry picked from commit a9be0b6a4e39240871a9b35ae9afd04f242a3ea4) Reviewed-on: https://gerrit.libreoffice.org/34757 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit e2eb25a52d86eec868ace658dd3a27eaf536b311)
-rw-r--r--vcl/source/window/mouse.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/vcl/source/window/mouse.cxx b/vcl/source/window/mouse.cxx
index adea785a8a38..a2a214b019e4 100644
--- a/vcl/source/window/mouse.cxx
+++ b/vcl/source/window/mouse.cxx
@@ -160,7 +160,8 @@ void Window::ImplCallMouseMove( sal_uInt16 nMouseCode, bool bModChanged )
void Window::ImplGenerateMouseMove()
{
- if ( !mpWindowImpl->mpFrameData->mnMouseMoveId )
+ if ( mpWindowImpl && mpWindowImpl->mpFrameData &&
+ !mpWindowImpl->mpFrameData->mnMouseMoveId )
mpWindowImpl->mpFrameData->mnMouseMoveId = Application::PostUserEvent( LINK( mpWindowImpl->mpFrameWindow, Window, ImplGenerateMouseMoveHdl ), nullptr, true );
}