diff options
author | Weblate <noreply@weblate.org> | 2017-08-02 21:00:16 +0000 |
---|---|---|
committer | Weblate <noreply@weblate.org> | 2017-08-02 21:00:16 +0000 |
commit | 3d511a0f8285088eba24cb22b15cda039d27f6a0 (patch) | |
tree | 2eccf8b44a5e9862e6733880c37d57a9af74b41a /src-qt5/core/lumina-session/session.cpp | |
parent | Translated using Weblate (Spanish) (diff) | |
parent | Fix up the screensaver animation crashes *again*. (diff) | |
download | lumina-3d511a0f8285088eba24cb22b15cda039d27f6a0.tar.gz lumina-3d511a0f8285088eba24cb22b15cda039d27f6a0.tar.bz2 lumina-3d511a0f8285088eba24cb22b15cda039d27f6a0.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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src-qt5/core/lumina-session/session.cpp b/src-qt5/core/lumina-session/session.cpp index de9b86ee..48a25a8f 100644 --- a/src-qt5/core/lumina-session/session.cpp +++ b/src-qt5/core/lumina-session/session.cpp @@ -89,7 +89,7 @@ void LSession::start(bool unified){ QSettings sessionsettings("lumina-desktop","sessionsettings"); QString WM = sessionsettings.value("WindowManager", "fluxbox").toString(); //Window Manager First - if(WM=="fluxbox"){ + if(WM=="fluxbox" || WM.endsWith("/fluxbox") || WM.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"; |