vcl/source/window/floatwin.cxx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
New commits: commit cf98c4b48881b283cc31bfcde678e2f30bb63ba1 Author: Ashod Nakashian <[email protected]> AuthorDate: Wed Dec 18 10:20:56 2019 -0500 Commit: Ashod Nakashian <[email protected]> CommitDate: Mon Dec 23 02:29:50 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 <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> (cherry picked from commit 25d8db8598ac54fe3ef1d6f40076ff19db87cd2f) Reviewed-on: https://gerrit.libreoffice.org/85686 Tested-by: Jenkins Reviewed-by: Ashod Nakashian <[email protected]> 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(); + } } } _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
