From 35b2806ce1df4745627214dbead72f3508f1235a Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Mon, 14 Aug 2017 09:11:41 -0400 Subject: Couple trivial changes to some files. --- src-qt5/core/lumina-session/session.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src-qt5/core/lumina-session/session.cpp') diff --git a/src-qt5/core/lumina-session/session.cpp b/src-qt5/core/lumina-session/session.cpp index f9c8060a..9aebec49 100644 --- a/src-qt5/core/lumina-session/session.cpp +++ b/src-qt5/core/lumina-session/session.cpp @@ -95,7 +95,7 @@ void LSession::start(bool unified){ QSettings sessionsettings("lumina-desktop","sessionsettings"); QString WM = sessionsettings.value("WindowManager", "fluxbox").toString(); //Window Manager First - if(WM=="fluxbox" || WM.endsWith("/fluxbox") || WM.isEmpty() ){ + if(WM=="fluxbox" || WM.endsWith("/fluxbox") || WM.simplified().isEmpty() ){ // FLUXBOX BUG BYPASS: if the ~/.fluxbox dir does not exist, it will ignore the given config file if( !LUtils::isValidBinary("fluxbox") ){ qDebug() << "[INCOMPLETE LUMINA INSTALLATION] fluxbox binary is missing - cannot continue"; -- cgit From 99fa7c8ab6198db465feca916dd9ea92e602f973 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Mon, 14 Aug 2017 11:54:05 -0400 Subject: Add a wm failure counter to start-lumina-desktop, and restart the process up to 3 times maximum. --- src-qt5/core/lumina-session/session.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src-qt5/core/lumina-session/session.cpp') diff --git a/src-qt5/core/lumina-session/session.cpp b/src-qt5/core/lumina-session/session.cpp index 9aebec49..fb9c6cd1 100644 --- a/src-qt5/core/lumina-session/session.cpp +++ b/src-qt5/core/lumina-session/session.cpp @@ -39,6 +39,7 @@ void LSession::procFinished(){ if(!stopping){ //See if this process is the main desktop binary if(PROCS[i]->objectName()=="runtime"){ stopall(); } + else if(PROCS[i]->objectName()=="wm" && wmfails<3){ wmfails++; PROCS[i]->start(QIODevice::ReadOnly); } //restart the WM //if(PROCS[i]->program().section("/",-1) == "lumina-desktop"){ stopall(); } //start closing down everything //else{ PROCS[i]->start(QIODevice::ReadOnly); } //restart the process //break; -- cgit From 85ad3904f27ddfc131d5d30b3aea230cbbaa9fbc Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Tue, 15 Aug 2017 11:43:57 -0400 Subject: Setup the WM restart routine to make it more flexible: 1) The WM will be restarted a maximum of twice with crashes less than 5 seconds apart. 2) This makes it more flexible with regards to opeartions which require that fluxbox be restarted (such as changing the screen around). --- src-qt5/core/lumina-session/session.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src-qt5/core/lumina-session/session.cpp') diff --git a/src-qt5/core/lumina-session/session.cpp b/src-qt5/core/lumina-session/session.cpp index fb9c6cd1..3fdf9e66 100644 --- a/src-qt5/core/lumina-session/session.cpp +++ b/src-qt5/core/lumina-session/session.cpp @@ -39,7 +39,7 @@ void LSession::procFinished(){ if(!stopping){ //See if this process is the main desktop binary if(PROCS[i]->objectName()=="runtime"){ stopall(); } - else if(PROCS[i]->objectName()=="wm" && wmfails<3){ wmfails++; PROCS[i]->start(QIODevice::ReadOnly); } //restart the WM + else if(PROCS[i]->objectName()=="wm" && wmfails<2){ wmfails++; PROCS[i]->start(QIODevice::ReadOnly); wmTimer->start(); } //restart the WM //if(PROCS[i]->program().section("/",-1) == "lumina-desktop"){ stopall(); } //start closing down everything //else{ PROCS[i]->start(QIODevice::ReadOnly); } //restart the process //break; -- cgit