From 159ec429d136adc208922f27ba6044b529022dde Mon Sep 17 00:00:00 2001 From: Samuel Mehrbrodt Date: Mon, 12 Dec 2016 17:29:28 +0100 Subject: 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 Tested-by: Samuel Mehrbrodt (cherry picked from commit 0fda52cc4a5c78c55f96850faa734ea66891808c) Reviewed-on: https://gerrit.libreoffice.org/31937 Tested-by: Jenkins --- svx/source/dialog/SafeModeDialog.cxx | 1 + 1 file changed, 1 insertion(+) (limited to 'svx') 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(); } -- cgit