svx/source/dialog/SafeModeDialog.cxx | 3 +++ 1 file changed, 3 insertions(+)
New commits: commit 18a4aa3f70419e3b51a324912d0444eecf92dbd6 Author: Samuel Mehrbrodt <[email protected]> Date: Wed Oct 12 16:48:49 2016 +0200 SafeModeDialog: Remove flag also when exiting Change-Id: I5d1bf17ace062f07287d3b3427eaab144ea7c0f8 diff --git a/svx/source/dialog/SafeModeDialog.cxx b/svx/source/dialog/SafeModeDialog.cxx index 1da58a0..53d9911 100644 --- a/svx/source/dialog/SafeModeDialog.cxx +++ b/svx/source/dialog/SafeModeDialog.cxx @@ -71,6 +71,9 @@ bool SafeModeDialog::Close() void SafeModeDialog::terminateOffice() { + // We are not hitting Close() in this case, need to manually remove the flag + sfx2::SafeMode::removeFlag(); + uno::Reference<frame::XDesktop2> xDesktop = frame::Desktop::create( comphelper::getProcessComponentContext() ); xDesktop->terminate(); } _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
