Fix up the launching of the desktop session

1. Clear out the lockfiles for a session before launching it
2. Provide some mechanisms for returning lockfile paths without creating a new single-instance session.
3. A couple other random commits I still had staged on my laptop (settings menu tweak)

1 files changed, 21 insertions, 8 deletions

diff --git a/src-qt5/core/libLumina/LuminaSingleApplication.cpp b/src-qt5/core/libLumina/LuminaSingleApplication.cpp
index 379ac02d..0c04229c 100644
--- a/src-qt5/core/libLumina/LuminaSingleApplication.cpp
+++ b/src-qt5/core/libLumina/LuminaSingleApplication.cpp
@@ -18,14 +18,7 @@ LSingleApplication::LSingleApplication(int &argc, char **argv, QString appname)
   this->setAttribute(Qt::AA_UseHighDpiPixmaps);
   if(appname!="lumina-desktop"){ cTrans = LUtils::LoadTranslation(this, appname); }//save the translator for later
   //Initialize a couple convenience internal variables
-  cfile = QDir::tempPath()+"/.LSingleApp-%1-%2-%3";
-  QString username = QString::number(getuid());
-  //For locking the process use the official process name - not the user input (no masking)
-  appname = this->applicationName();
-  QString display = QString(getenv("DISPLAY"));
-  if(display.startsWith(":")){ display.remove(0,1); }
-  display = display.section(".",0,0);
-  cfile = cfile.arg( username, appname, display );
+  cfile = getLockfileName(this->applicationName()); //do not allow masking the utility name
   lockfile = new QLockFile(cfile+"-lock");
     lockfile->setStaleLockTime(0); //long-lived processes
   for(int i=1; i<argc; i++){
@@ -59,6 +52,26 @@ LSingleApplication::~LSingleApplication(){
   }
 }
 
+QString LSingleApplication::getLockfileName(QString appname){
+  QString path = QDir::tempPath()+"/.LSingleApp-%1-%2-%3";
+  QString username = QString::number(getuid());
+  QString display = QString(getenv("DISPLAY"));
+  if(display.startsWith(":")){ display.remove(0,1); }
+  display = display.section(".",0,0);
+  path = path.arg( username, appname, display );
+  return path;
+}
+
+void LSingleApplication::removeLocks(QString appname){
+  QString path = getLockfileName(appname);
+  if(QFile::exists(path+"-lock")){
+    QFile::remove(path+"-lock");
+  }
+  if(QFile::exists(path)){
+    QFile::remove(path);
+  }
+}
+
 bool LSingleApplication::isPrimaryProcess(){
   return (isActive || isBypass);
 }