aboutsummaryrefslogtreecommitdiff
path: root/src-qt5/core/lumina-session/session.cpp
diff options
context:
space:
mode:
authorKen Moore <ken@ixsystems.com>2016-10-11 07:40:31 -0400
committerKen Moore <ken@ixsystems.com>2016-10-11 07:40:31 -0400
commit1da456302b2fab1fdaab989abd51b11ed23f9a2a (patch)
treee468c407dbf3af6aecbe5d500a4e51025e45690b /src-qt5/core/lumina-session/session.cpp
parentMerge branch 'master' of github.com:trueos/lumina (diff)
downloadlumina-1da456302b2fab1fdaab989abd51b11ed23f9a2a.tar.gz
lumina-1da456302b2fab1fdaab989abd51b11ed23f9a2a.tar.bz2
lumina-1da456302b2fab1fdaab989abd51b11ed23f9a2a.zip
Fix up the logout bug in Lumina after some changes to the startup routine.
Diffstat (limited to 'src-qt5/core/lumina-session/session.cpp')
-rw-r--r--src-qt5/core/lumina-session/session.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src-qt5/core/lumina-session/session.cpp b/src-qt5/core/lumina-session/session.cpp
index 20c55ec4..2647e58d 100644
--- a/src-qt5/core/lumina-session/session.cpp
+++ b/src-qt5/core/lumina-session/session.cpp
@@ -36,7 +36,8 @@ void LSession::procFinished(){
stopped++;
if(!stopping){
//See if this process is the main desktop binary
- if(PROCS[i]->program().section("/",-1) == "lumina-desktop"){ stopall(); } //start closing down everything
+ if(PROCS[i]->objectName()=="runtime"){ stopall(); }
+ //if(PROCS[i]->program().section("/",-1) == "lumina-desktop"){ stopall(); } //start closing down everything
//else{ PROCS[i]->start(QIODevice::ReadOnly); } //restart the process
break;
}
@@ -58,6 +59,7 @@ void LSession::startProcess(QString ID, QString command, QStringList watchfiles)
proc->setProcessChannelMode(QProcess::MergedChannels);
proc->setProcessEnvironment( QProcessEnvironment::systemEnvironment() );
proc->setStandardOutputFile(logfile);
+ proc->setObjectName(ID);
if(ID=="runtime"){
//Bypass for a hidden dbus requirement for Qt itself (Qt 5.5.1)
QDir tmp = QDir::temp();
bgstack15