diff options
| author | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2020-02-02 14:37:38 -0500 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2020-02-12 21:27:09 +0100 |
| commit | c70d31a274b9e7b47dbf6622c84a7a3431360b9e (patch) | |
| tree | 336c2bd8c9eb91acaf8fc493018c766c7576d498 | |
| parent | 88d54208f14a1a3941df0a9bc3097ccff2a43368 (diff) | |
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.meeks@collabora.com>
Tested-by: Aron Budea <aron.budea@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88538
Tested-by: Jenkins
| -rw-r--r-- | vcl/source/window/cursor.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/vcl/source/window/cursor.cxx b/vcl/source/window/cursor.cxx index 3b55bea61690..340fbb77d985 100644 --- a/vcl/source/window/cursor.cxx +++ b/vcl/source/window/cursor.cxx @@ -201,8 +201,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 || (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; } |