vcl/source/window/cursor.cxx | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 9ec3d637c1c99c729da67eafc375efce1cc7f026
Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk>
AuthorDate: Sun Feb 2 14:37:38 2020 -0500
Commit: Aron Budea <aron.bu...@collabora.com>
CommitDate: Thu Feb 6 10:28:05 2020 +0100
vcl: avoid accessing null member on unloading views
Change-Id: If4e416c7257c861b9e13352b3329d9719b159e61
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87830
Reviewed-by: Michael Meeks <michael.me...@collabora.com>
Tested-by: Aron Budea <aron.bu...@collabora.com>
diff --git a/vcl/source/window/cursor.cxx b/vcl/source/window/cursor.cxx
index f4cb6f52e13f..2787b3566c8a 100644
--- a/vcl/source/window/cursor.cxx
+++ b/vcl/source/window/cursor.cxx
@@ -179,8 +179,9 @@ void vcl::Cursor::ImplDoShow( bool bDrawDirect, bool
bRestore )
// show the cursor, if there is an active window and the cursor
// has been selected in this window
pWindow = Application::GetFocusWindow();
- if ( !pWindow || (pWindow->mpWindowImpl->mpCursor != this) ||
pWindow->mpWindowImpl->mbInPaint
- || !pWindow->mpWindowImpl->mpFrameData->mbHasFocus )
+ if (!pWindow || !pWindow->mpWindowImpl ||
(pWindow->mpWindowImpl->mpCursor != this)
+ || pWindow->mpWindowImpl->mbInPaint
+ || !pWindow->mpWindowImpl->mpFrameData->mbHasFocus)
pWindow = nullptr;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
