vcl/source/window/floatwin.cxx | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
New commits:
commit 25d8db8598ac54fe3ef1d6f40076ff19db87cd2f
Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk>
AuthorDate: Wed Dec 18 10:20:56 2019 -0500
Commit: Ashod Nakashian <ashnak...@gmail.com>
CommitDate: Wed Dec 18 19:53:43 2019 +0100
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.me...@collabora.com>
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index 6c27982ae74f..0ef5125e92c7 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();
+ }
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
