diff options
| author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2016-12-12 17:29:28 +0100 |
|---|---|---|
| committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2016-12-13 09:55:39 +0000 |
| commit | 159ec429d136adc208922f27ba6044b529022dde (patch) | |
| tree | fcec5d4ab6ee6e152c9c7625c250d35116b9db31 /svx | |
| parent | 9c1d6f5e3549cf3c90d28f86b67db4af41dcbde8 (diff) | |
SafeMode: Restart goes into safe mode again
Looks like the XRestartManager keeps all command line arguments when
restarting, so it also keeps --safe-mode.
Solution is to add a flag file when restarting from safe mode,
to prevent going into safe mode again.
Change-Id: I9820d3ccbddf98b0bf6132f254c989f52ea5e808
Reviewed-on: https://gerrit.libreoffice.org/31913
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
(cherry picked from commit 0fda52cc4a5c78c55f96850faa734ea66891808c)
Reviewed-on: https://gerrit.libreoffice.org/31937
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/dialog/SafeModeDialog.cxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/svx/source/dialog/SafeModeDialog.cxx b/svx/source/dialog/SafeModeDialog.cxx index ac9c494d9f8e..b77b83fe680a 100644 --- a/svx/source/dialog/SafeModeDialog.cxx +++ b/svx/source/dialog/SafeModeDialog.cxx @@ -326,6 +326,7 @@ IMPL_LINK(SafeModeDialog, DialogBtnHdl, Button*, pBtn, void) } else if (pBtn == mpBtnRestart.get()) { + sfx2::SafeMode::putRestartFlag(); Close(); applyChanges(); } |