[Libreoffice-commits] core.git: desktop/source

Tomaž Vajngerl tomaz.vajngerl at collabora.co.uk
Mon Mar 20 12:53:10 UTC 2017


 desktop/source/app/app.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit e503a69e962bf1b39104e3df91b452702a62aa0e
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
Date:   Mon Mar 20 13:50:21 2017 +0100

    don't check safe mode on Android
    
    Change-Id: I2ebd3ad3783cd0bb0236574edb1cb428c522aed3

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index fde39b850b81..bf2243694675 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -2080,11 +2080,12 @@ void Desktop::OpenClients()
     // need some time, where the user won't see any results and wait for finishing the office startup...
     bool bAllowRecoveryAndSessionManagement = ( !rArgs.IsNoRestore() ) && ( !rArgs.IsHeadless()  );
 
+#if !defined ANDROID
     // Enter safe mode if requested
     if (Application::IsSafeModeEnabled()) {
         handleSafeMode();
     }
-
+#endif
 
 #if HAVE_FEATURE_BREAKPAD
     if (crashReportInfoExists())


More information about the Libreoffice-commits mailing list