summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2014-04-15 11:41:23 +0200
committerJan Holesovsky <kendy@collabora.com>2014-04-15 13:10:56 +0200
commit048d27bae87f2a39a0fc853e32b474ab58e92dde (patch)
tree1bdbd62f6ef2c820026a10f9e210323c6fca77b0 /desktop
parent6b7e0c7a9fc0c4e1a58b43204ee385397d8f21bf (diff)
non-desktop: Don't even attempt to create a lockfile.
Change-Id: I68a4cf8f2e302b49e3d2719ee2bad3f823e8a036
Diffstat (limited to 'desktop')
-rw-r--r--desktop/source/app/app.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 75c9cf2f958a..518c6949a7d5 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1422,12 +1422,12 @@ int Desktop::Main()
SetSplashScreenProgress(25);
+#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
SAL_INFO( "desktop.app", "desktop (lo119109) Desktop::Main -> Lockfile" );
m_xLockfile.reset(new Lockfile);
-#if HAVE_FEATURE_DESKTOP
if ( !rCmdLineArgs.IsHeadless() && !rCmdLineArgs.IsInvisible() &&
!rCmdLineArgs.IsNoLockcheck() && !m_xLockfile->check( Lockfile_execWarning ))
{