From aac096d897c01896519cb21d8ce1c9ad9627d9c2 Mon Sep 17 00:00:00 2001
From: dismine <dismine@gmail.com>
Date: Mon, 26 Jan 2015 17:02:57 +0200
Subject: [PATCH] Fixed issue #223. Attempt to remove stale lock file.

--HG--
branch : develop
---
 src/app/core/vapplication.cpp | 43 ++++++++++++++++++++++++++++++++---
 src/app/core/vapplication.h   |  2 ++
 src/app/mainwindow.cpp        |  4 ++--
 3 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/src/app/core/vapplication.cpp b/src/app/core/vapplication.cpp
index 57a6feb96..b6b3bc84b 100644
--- a/src/app/core/vapplication.cpp
+++ b/src/app/core/vapplication.cpp
@@ -339,6 +339,43 @@ double VApplication::fromPixel(double pix) const
     return fromPixel(pix, _patternUnit);
 }
 
+//---------------------------------------------------------------------------------------------------------------------
+bool VApplication::TryLock(QLockFile *lock)
+{
+    if (lock == nullptr)
+    {
+        return false;
+    }
+
+    if (lock->tryLock())
+    {
+        return true;
+    }
+    else
+    {
+        if (lock->error() == QLockFile::LockFailedError)
+        {
+            // This happens if a stale lock file exists and another process uses that PID.
+            // Try removing the stale file, which will fail if a real process is holding a
+            // file-level lock. A false error is more problematic than not locking properly
+            // on corner-case systems.
+            if (lock->removeStaleLockFile() == false || lock->tryLock() == false)
+            {
+                return false;
+            }
+            else
+            {
+                return true;
+            }
+        }
+        else
+        {
+            return false;
+        }
+        return false;
+    }
+}
+
 //---------------------------------------------------------------------------------------------------------------------
 QString VApplication::pathToTables() const
 {
@@ -461,7 +498,7 @@ void VApplication::BeginLogging()
         qInstallMessageHandler(noisyFailureMsgHandler);
         logLock = new QLockFile(LogPath()+".lock");
         logLock->setStaleLockTime(0);
-        if (logLock->tryLock())
+        if (TryLock(logLock))
         {
             qCDebug(vApp) << "Log file"<<LogPath()<<"was locked.";
         }
@@ -495,7 +532,7 @@ void VApplication::ClearOldLogs() const
         {
             QFileInfo info(allFiles.at(i));
             QLockFile *lock = new QLockFile(info.absoluteFilePath() + ".lock");
-            if (lock->tryLock())
+            if (TryLock(lock))
             {
                 qCDebug(vApp) << "Locked file"<<info.absoluteFilePath();
                 QFile oldLog(allFiles.at(i));
@@ -2118,7 +2155,7 @@ void VApplication::GatherLogs() const
                 }
                 QLockFile *logLock = new QLockFile(info.absoluteFilePath()+".lock");
                 logLock->setStaleLockTime(0);
-                if (logLock->tryLock())
+                if (TryLock(logLock))
                 {
                     *out <<"--------------------------" << endl;
                     QFile logFile(info.absoluteFilePath());
diff --git a/src/app/core/vapplication.h b/src/app/core/vapplication.h
index 7122d424d..93a864d50 100644
--- a/src/app/core/vapplication.h
+++ b/src/app/core/vapplication.h
@@ -70,6 +70,8 @@ public:
     double             fromPixel(double pix, const Unit &unit) const;
     double             fromPixel(double pix) const;
 
+    static bool        TryLock(QLockFile *lock);
+
     static const qreal PrintDPI;
     QString            translationsPath() const;
     QString            pathToTables() const;
diff --git a/src/app/mainwindow.cpp b/src/app/mainwindow.cpp
index 01097d8de..f76099bd1 100644
--- a/src/app/mainwindow.cpp
+++ b/src/app/mainwindow.cpp
@@ -2365,7 +2365,7 @@ void MainWindow::LoadPattern(const QString &fileName)
     qCDebug(vMainWindow)<<"Loking file";
     lock = new QLockFile(fileName+".lock");
     lock->setStaleLockTime(0);
-    if (lock->tryLock())
+    if (VApplication::TryLock(lock))
     {
         qCDebug(vMainWindow) << "Pattern file"<<fileName<<"was locked.";
     }
@@ -2477,7 +2477,7 @@ QStringList MainWindow::GetUnlokedRestoreFileList() const
             // Seeking file that realy need reopen
             QLockFile *lock = new QLockFile(files.at(i)+".lock");
             lock->setStaleLockTime(0);
-            if (lock->tryLock())
+            if (VApplication::TryLock(lock))
             {
                 restoreFiles.append(files.at(i));
             }