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

[Szymon Kłos]

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

New commits:
commit 8c5f8fcb4a192cdbb92a70a24eeef173ab2f76b3
Author: Szymon Kłos <szymon.klos at collabora.com>
Date:   Thu Jul 13 16:40:31 2017 +0200

    tdf#109085 run LO with --nolockcheck
    
    Change-Id: Ia184d6e9653e008ce56e51aa0a2cb1f0a49988ef
    Reviewed-on: https://gerrit.libreoffice.org/39916
    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 796cc71df6b8..39474b850d24 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1449,12 +1449,14 @@ int Desktop::Main()
         // 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
         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
         if( Application::GetSettings().GetMiscSettings().GetEnableATToolSupport() )