summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2019-11-04 15:42:07 +0000
committerMichael Meeks <michael.meeks@collabora.com>2019-11-04 17:43:13 +0100
commitae1052613be96be1ec37695b094906edb41ac8cf (patch)
treecb3774c7792fda38224652ae7bc6c9e2c36c6f1b
parent75bbbfc6bd94246c75c6d0f0e0da5d55b41009b7 (diff)
lok: avoid ILibreOfficeKitNotifier null ptr de-reference on shutdown.
Change-Id: I79c8fa3ebf7ed457b7bebb4da536eb83f5cac567 Reviewed-on: https://gerrit.libreoffice.org/82035 Tested-by: Jenkins Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
-rw-r--r--vcl/source/window/window.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index b3df086f64be..0072ec49f1b8 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -3227,7 +3227,7 @@ ILibreOfficeKitNotifier::~ILibreOfficeKitNotifier()
for (auto it = GetLOKWindowsMap().begin(); it != GetLOKWindowsMap().end();)
{
WindowImpl* pWindowImpl = it->second->ImplGetWindowImpl();
- if (pWindowImpl->mpLOKNotifier == this)
+ if (pWindowImpl && pWindowImpl->mpLOKNotifier == this)
{
pWindowImpl->mpLOKNotifier = nullptr;
pWindowImpl->mnLOKWindowId = 0;