Make sure to kill any leftover windows that did not close properly during the session cleanup, and tag version 0.8.2-Release

2 files changed, 10 insertions, 6 deletions

diff --git a/libLumina/LuminaUtils.cpp b/libLumina/LuminaUtils.cpp
index 0294755f..e54b411b 100644
--- a/libLumina/LuminaUtils.cpp
+++ b/libLumina/LuminaUtils.cpp
@@ -21,7 +21,7 @@
 //  LUtils Functions
 //=============
 QString LUtils::LuminaDesktopVersion(){ 
-  return "0.8.2-devel"; 
+  return "0.8.2-Release"; 
 }
 
 int LUtils::runCmd(QString cmd, QStringList args){
diff --git a/lumina-desktop/LSession.cpp b/lumina-desktop/LSession.cpp
index 1d9a6de2..4b0a04e7 100644
--- a/lumina-desktop/LSession.cpp
+++ b/lumina-desktop/LSession.cpp
@@ -139,20 +139,24 @@ void LSession::CleanupSession(){
     LSession::processEvents();
   }  
   //Close any open windows
-  for(int i=0; i<RunningApps.length(); i++){
-    XCB->CloseWindow(RunningApps[i]);
+  QList<WId> WL = XCB->WindowList(true);
+  for(int i=0; i<WL.length(); i++){
+    XCB->CloseWindow(WL[i]);
     LSession::processEvents();
   }
   
   //Now wait a moment for things to close down before quitting
   for(int i=0; i<20; i++){ LSession::processEvents(); usleep(25); } //1/2 second pause
   
-  /*WL = LX11::WindowList();
+  //Kill any remaining windows
+  WL = XCB->WindowList(true); //all workspaces
   for(int i=0; i<WL.length(); i++){
     LX11::KillWindow(WL[i]);
     LSession::processEvents();
-  }*/
-  LSession::processEvents();
+  }
+  
+  //Now wait a moment for things to close down before quitting
+  for(int i=0; i<20; i++){ LSession::processEvents(); usleep(25); } //1/2 second pause
 }
 
 void LSession::launchStartupApps(){