diff options
| author | Tor Lillqvist <tml@collabora.com> | 2018-12-06 15:05:43 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2018-12-06 15:15:38 +0200 |
| commit | b301dcc711636533d0d8dade7fbb1decb058e18b (patch) | |
| tree | 71b0ff48cca9687fff6143edc8fd787529ebcbb8 /vcl | |
| parent | c8d4253f8637e31bf0823ecadc00f97c8d416039 (diff) | |
Don't fail assertion when setting the dialog cancel mode to its current value
Change-Id: Ie9d78346bb104734fddeb27ff0414b4c7ef64ae9
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/app/svapp.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
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() |