aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKen Moore <ken@ixsystems.com>2017-08-14 09:11:41 -0400
committerKen Moore <ken@ixsystems.com>2017-08-14 09:11:41 -0400
commit35b2806ce1df4745627214dbead72f3508f1235a (patch)
tree1c8440ce43cf21300ef8b991a173978c6d5d0aee
parentEnsure that lumina-pdf is added to the desktop-utils group. (diff)
downloadlumina-35b2806ce1df4745627214dbead72f3508f1235a.tar.gz
lumina-35b2806ce1df4745627214dbead72f3508f1235a.tar.bz2
lumina-35b2806ce1df4745627214dbead72f3508f1235a.zip
Couple trivial changes to some files.
-rw-r--r--src-qt5/core/lumina-desktop-unified/lumina-desktop.pro2
-rw-r--r--src-qt5/core/lumina-session/session.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src-qt5/core/lumina-desktop-unified/lumina-desktop.pro b/src-qt5/core/lumina-desktop-unified/lumina-desktop.pro
index 79f2ba6f..04d5b602 100644
--- a/src-qt5/core/lumina-desktop-unified/lumina-desktop.pro
+++ b/src-qt5/core/lumina-desktop-unified/lumina-desktop.pro
@@ -1,7 +1,7 @@
include($${PWD}/../../OS-detect.pri)
QT += core gui network
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets x11extras multimedia concurrent svg
+greaterThan(QT_MAJOR_VERSION, 4): QT += widgets x11extras multimedia multimediawidgets concurrent svg
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";
bgstack15