summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAron Budea <aron.budea@collabora.com>2017-07-14 16:46:29 +0200
committerAndras Timar <andras.timar@collabora.com>2017-07-15 11:48:32 +0200
commitca5b71fc2a2d214c453657b6b8a76025f78944a3 (patch)
tree361bfc5dbe39b17025168569518ee917107840c0
parent8c5f8fcb4a192cdbb92a70a24eeef173ab2f76b3 (diff)
tdf#109085: don't create lock file in profile
Change-Id: I7b6fd9da8c0280a2ee22494aa9bcc38b81f66111 Reviewed-on: https://gerrit.libreoffice.org/39972 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
-rw-r--r--desktop/source/app/app.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 39474b850d24..819bcde64954 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1447,9 +1447,10 @@ 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);
/* tdf#109085 temporary don't show warning about another instance running
+ m_xLockfile.reset(new Lockfile);
+
if ( !rCmdLineArgs.IsHeadless() && !rCmdLineArgs.IsInvisible() &&
!rCmdLineArgs.IsNoLockcheck() && !m_xLockfile->check( Lockfile_execWarning ))
{