[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - desktop/source

[Aron Budea]

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

New commits:
commit ca5b71fc2a2d214c453657b6b8a76025f78944a3
Author: Aron Budea <aron.budea at collabora.com>
Date:   Fri Jul 14 16:46:29 2017 +0200

    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 at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

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 ))
         {