diff options
-rw-r--r-- | desktop/source/app/app.cxx | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 4e6dc432f55e..e337130f66c3 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -1352,13 +1352,18 @@ int Desktop::Main() #if HAVE_FEATURE_DESKTOP // check user installation directory for lockfile so we can be sure // there is no other instance using our data files from a remote host - m_xLockfile.reset(new Lockfile); - if ( !rCmdLineArgs.IsHeadless() && !rCmdLineArgs.IsInvisible() && - !rCmdLineArgs.IsNoLockcheck() && !m_xLockfile->check( Lockfile_execWarning )) + bool bMustLockProfile = ( getenv( "SAL_NOLOCK_PROFILE" ) == nullptr ); + if ( bMustLockProfile ) { - // Lockfile exists, and user clicked 'no' - return EXIT_FAILURE; + m_xLockfile.reset(new Lockfile); + + if ( !rCmdLineArgs.IsHeadless() && !rCmdLineArgs.IsInvisible() && + !rCmdLineArgs.IsNoLockcheck() && !m_xLockfile->check( Lockfile_execWarning )) + { + // Lockfile exists, and user clicked 'no' + return EXIT_FAILURE; + } } // check if accessibility is enabled but not working and allow to quit |