Merge remote-tracking branch 'origin/master'

2 files changed, 9 insertions, 9 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";
diff --git a/src-qt5/core/lumina-session/session.h b/src-qt5/core/lumina-session/session.h
index 99127c07..caa61ad6 100644
--- a/src-qt5/core/lumina-session/session.h
+++ b/src-qt5/core/lumina-session/session.h
@@ -19,15 +19,15 @@ private:
 	QString id;
 private slots:
 	void filechanged(QString path){
-          qDebug() << "File Changed:" << path;
-	  qDebug() << " - Program:" << this->program();
+          //qDebug() << "File Changed:" << path;
+	  //qDebug() << " - Program:" << this->program();
 	  if(watcher==0){ return; } //just in case
 	  if(this->state()==QProcess::Running){
-	    if(this->program().section(" ",0,0).section("/",-1) == "fluxbox" ){ 
-              qDebug() << "Sending Fluxbox signal to reload configs..."; 
+	    if(this->program().section(" ",0,0).section("/",-1) == "fluxbox" ){
+             // qDebug() << "Sending Fluxbox signal to reload configs...";
               ::kill(this->pid(), SIGUSR2); } //Fluxbox needs SIGUSR2 to reload it's configs
-	    else if(this->program().section(" ",0,0).section("/",-1) == "compton" ){ 
-              qDebug() << "Sending Compton signal to reload configs...";
+	    else if(this->program().section(" ",0,0).section("/",-1) == "compton" ){
+              //qDebug() << "Sending Compton signal to reload configs...";
               ::kill(this->pid(), SIGUSR1); } //Compton needs SIGUSR1 to reload it's configs
 	  }
 	  //Now make sure this file/dir was not removed from the watcher
@@ -40,7 +40,7 @@ public:
 	  id=ID;
 	  watcher = 0;
           if(!watchfiles.isEmpty()){
-            qDebug() << "Watch Files for changes:" << ID << watchfiles;
+            //qDebug() << "Watch Files for changes:" << ID << watchfiles;
 	    watcher = new QFileSystemWatcher(this);
 	    connect(watcher, SIGNAL(fileChanged(QString)), this, SLOT(filechanged(QString)) );
 	    connect(watcher, SIGNAL(directoryChanged(QString)), this, SLOT(filechanged(QString)) );
@@ -74,5 +74,5 @@ public:
 	~LSession(){ }
 
 	void start(bool unified = false);
-	
+
 };