From 0fda52cc4a5c78c55f96850faa734ea66891808c 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 --- include/sfx2/safemode.hxx | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/sfx2/safemode.hxx b/include/sfx2/safemode.hxx index 03f85904271c..47034f62130a 100644 --- a/include/sfx2/safemode.hxx +++ b/include/sfx2/safemode.hxx @@ -40,9 +40,31 @@ public: */ static bool removeFlag(); + /** + * Write a flag to the user profile indicating that we are currently restarting from safe mode - + * that means we don't want to enter safe mode again. + * + * @return Whether the file could be written successfully + */ + static bool putRestartFlag(); + + /** + * Check the existence of the restart flag file. + * + * @return Whether the restart flag file exists + */ + static bool hasRestartFlag(); + + /** + * Remove the restart flag file. + * + * @return Whether the flag file could be removed successfully + */ + static bool removeRestartFlag(); + private: /** Returns the path of the safe mode flag file.*/ - static OUString getFileName(); + static OUString getFilePath(const OUString& sFilename); }; } -- cgit