vcl/source/app/svapp.cxx | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
New commits:
commit b301dcc711636533d0d8dade7fbb1decb058e18b
Author: Tor Lillqvist <t...@collabora.com>
AuthorDate: Thu Dec 6 15:05:43 2018 +0200
Commit: Tor Lillqvist <t...@collabora.com>
CommitDate: Thu Dec 6 15:15:38 2018 +0200
Don't fail assertion when setting the dialog cancel mode to its current
value
Change-Id: Ie9d78346bb104734fddeb27ff0414b4c7ef64ae9
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 40ff79b7d70f..f4d2080849de 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -1438,9 +1438,11 @@ const LocaleDataWrapper&
Application::GetAppLocaleDataWrapper()
void Application::EnableHeadlessMode( bool dialogsAreFatal )
{
- assert(GetDialogCancelMode() == DialogCancelMode::Off);
- SetDialogCancelMode(
- dialogsAreFatal ? DialogCancelMode::Fatal : DialogCancelMode::Silent );
+ DialogCancelMode eNewMode = dialogsAreFatal ? DialogCancelMode::Fatal :
DialogCancelMode::Silent;
+ DialogCancelMode eOldMode = GetDialogCancelMode();
+ assert(eOldMode == DialogCancelMode::Off || GetDialogCancelMode() ==
eNewMode);
+ if (eOldMode != eNewMode)
+ SetDialogCancelMode( eNewMode );
}
bool Application::IsHeadlessModeEnabled()
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
