Added SAL_NOLOCK_PROFILE variable to ignore lockfile
Change-Id: I4fb250468fc17fc8be94d666ef231636b4609c1d
Reviewed-on: https://gerrit.libreoffice.org/40520
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 4e6dc43..e337130f 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
