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

[Aron Budea]

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

New commits:
commit 68f54670d13ce4d2a93ec59b8760e20669064781
Author: Aron Budea <aron.budea at collabora.com>
Date:   Mon Jun 4 20:35:34 2018 +0200

    Disable profile locking
    
    Change-Id: Id64e183eff78e90237c4d1cff224aac302bfbe04
    Reviewed-on: https://gerrit.libreoffice.org/55294
    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 ec1b6531316c..7f0ace481270 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1318,7 +1318,8 @@ int Desktop::Main()
         // check user installation directory for lockfile so we can be sure
         // there is no other instance using our data files from a remote host
 
-        bool bMustLockProfile = ( getenv( "SAL_NOLOCK_PROFILE" ) == nullptr );
+        // bool bMustLockProfile = ( getenv( "SAL_NOLOCK_PROFILE" ) == nullptr );
+        bool bMustLockProfile = false;
         if ( bMustLockProfile )
         {
             m_xLockfile.reset(new Lockfile);