summaryrefslogtreecommitdiff
path: root/vcl/source/window/floatwin.cxx
diff options
context:
space:
mode:
authorAshod Nakashian <ashod.nakashian@collabora.co.uk>2019-12-18 10:20:56 -0500
committerAshod Nakashian <ashnakash@gmail.com>2019-12-23 02:29:50 +0100
commitcf98c4b48881b283cc31bfcde678e2f30bb63ba1 (patch)
tree547f9e8ef9b800b4dd33461028d462a29c362f73 /vcl/source/window/floatwin.cxx
parentf2648e6bc6a7200087e58fa84c7a14d2a27c45c5 (diff)
sfx2: tolerate missing LOKNotifier on FloatingWindow hide
It seems the assumption is that if we get to hide state then we must have initialized properly and set a LOKNotifier. But this seems not to always hold, for whatever reason. Here we are more forgiving if we don't have LOKNotifier. Change-Id: Id21ec83489776f34228dd31f63e711b0dd77af55 Reviewed-on: https://gerrit.libreoffice.org/85401 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> (cherry picked from commit 25d8db8598ac54fe3ef1d6f40076ff19db87cd2f) Reviewed-on: https://gerrit.libreoffice.org/85686 Tested-by: Jenkins Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Diffstat (limited to 'vcl/source/window/floatwin.cxx')
-rw-r--r--vcl/source/window/floatwin.cxx8
1 files changed, 5 insertions, 3 deletions
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index 8f18936d0ff0..a010533c79aa 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -666,9 +666,11 @@ void FloatingWindow::StateChanged( StateChangedType nType )
}
else if (!IsVisible() && nType == StateChangedType::Visible)
{
- assert(GetLOKNotifier());
- GetLOKNotifier()->notifyWindow(GetLOKWindowId(), "close");
- ReleaseLOKNotifier();
+ if (const vcl::ILibreOfficeKitNotifier* pNotifier = GetLOKNotifier())
+ {
+ pNotifier->notifyWindow(GetLOKWindowId(), "close");
+ ReleaseLOKNotifier();
+ }
}
}