aboutsummaryrefslogtreecommitdiff
path: root/src-qt5/core/libLumina/LuminaSingleApplication.cpp
diff options
context:
space:
mode:
authorWeblate <noreply@weblate.org>2017-08-02 21:00:16 +0000
committerWeblate <noreply@weblate.org>2017-08-02 21:00:16 +0000
commit3d511a0f8285088eba24cb22b15cda039d27f6a0 (patch)
tree2eccf8b44a5e9862e6733880c37d57a9af74b41a /src-qt5/core/libLumina/LuminaSingleApplication.cpp
parentTranslated using Weblate (Spanish) (diff)
parentFix up the screensaver animation crashes *again*. (diff)
downloadlumina-3d511a0f8285088eba24cb22b15cda039d27f6a0.tar.gz
lumina-3d511a0f8285088eba24cb22b15cda039d27f6a0.tar.bz2
lumina-3d511a0f8285088eba24cb22b15cda039d27f6a0.zip
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src-qt5/core/libLumina/LuminaSingleApplication.cpp')
-rw-r--r--src-qt5/core/libLumina/LuminaSingleApplication.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src-qt5/core/libLumina/LuminaSingleApplication.cpp b/src-qt5/core/libLumina/LuminaSingleApplication.cpp
index a97753c5..86248666 100644
--- a/src-qt5/core/libLumina/LuminaSingleApplication.cpp
+++ b/src-qt5/core/libLumina/LuminaSingleApplication.cpp
@@ -35,12 +35,12 @@ LSingleApplication::LSingleApplication(int &argc, char **argv, QString appname)
}else{
if(!path.startsWith("/") && !path.startsWith("-") ){ path.prepend(QDir::currentPath()+"/"); }
}
- inputlist << path;
+ inputlist << path;
}
isActive = isBypass = false;
lserver = 0;
//Now check for the manual CLI flag to bypass single-instance forwarding (if necessary)
- if(inputlist.contains("-new-instance")){
+ if(inputlist.contains("-new-instance")){
isBypass = true;
inputlist.removeAll("-new-instance");
}
@@ -48,16 +48,16 @@ LSingleApplication::LSingleApplication(int &argc, char **argv, QString appname)
}
LSingleApplication::~LSingleApplication(){
- if(lserver != 0 && lockfile->isLocked() ){
+ if(lserver != 0 && lockfile->isLocked() ){
//currently locked instance: remove the lock now
lserver->close();
QLocalServer::removeServer(cfile);
- lockfile->unlock();
+ lockfile->unlock();
}
}
bool LSingleApplication::isPrimaryProcess(){
- return (isActive || isBypass);
+ return (isActive || isBypass);
}
void LSingleApplication::PerformLockChecks(){
@@ -99,7 +99,7 @@ void LSingleApplication::PerformLockChecks(){
lockfile->unlock();
isActive = true;
}
-
+
}else if(!isBypass){
//forward the current inputs to the locked process for processing and exit
//Check the connection to the local server first
bgstack15