Merge pull request #17609 from wwmayer/issue_17576

Core: Don't freeze application if lock file already exists

src/App/Application.cpp

@@ -47,6 +47,7 @@
 #include <sys/sysctl.h>
 #endif
 
+#include <QCoreApplication>
 #include <QDir>
 #include <QFileInfo>
 #include <QProcessEnvironment>
@@ -1114,6 +1115,11 @@ Application::TransactionSignaller::~TransactionSignaller() {
     }
 }
 
+int64_t Application::applicationPid()
+{
+    return QCoreApplication::applicationPid();
+}
+
 std::string Application::getHomePath()
 {
     return mConfig["AppHomePath"];