diff options
| author | Weblate <noreply@weblate.org> | 2017-08-17 16:03:32 +0000 |
|---|---|---|
| committer | Weblate <noreply@weblate.org> | 2017-08-17 16:03:32 +0000 |
| commit | a47ab10c6ea6057de5567f66292250d187d75ab9 (patch) | |
| tree | d0cde7717f8fec52697d178dc6ef2a79ce927d68 /src-qt5/core/lumina-session/session.cpp | |
| parent | Translated using Weblate (Portuguese (Brazil)) (diff) | |
| parent | Merge remote-tracking branch 'origin/master' (diff) | |
| download | lumina-a47ab10c6ea6057de5567f66292250d187d75ab9.tar.gz lumina-a47ab10c6ea6057de5567f66292250d187d75ab9.tar.bz2 lumina-a47ab10c6ea6057de5567f66292250d187d75ab9.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src-qt5/core/lumina-session/session.cpp')
| -rw-r--r-- | src-qt5/core/lumina-session/session.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src-qt5/core/lumina-session/session.cpp b/src-qt5/core/lumina-session/session.cpp index f9c8060a..3fdf9e66 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<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; @@ -95,7 +96,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"; |