Move the desktop initialization after the menu's initialization. With all teh additional process events calls the menus needs to be ready before desktop elements start trying to use them.

1 files changed, 8 insertions, 7 deletions

diff --git a/lumina-desktop/LSession.cpp b/lumina-desktop/LSession.cpp
index d4f7c2f0..5866b19d 100644
--- a/lumina-desktop/LSession.cpp
+++ b/lumina-desktop/LSession.cpp
@@ -25,7 +25,7 @@
 #include <X11/extensions/Xdamage.h>
 
 #ifndef DEBUG
-#define DEBUG 0
+#define DEBUG 1
 #endif
 
 XCBEventFilter *evFilter = 0;
@@ -108,22 +108,23 @@ void LSession::setupSession(){
   WM = new WMProcess();
     WM->startWM();
 	
-  //Initialize the desktops
-    splash.showScreen("desktop");
-  if(DEBUG){ qDebug() << " - Init Desktops:" << timer->elapsed();}
-  updateDesktops();
-
   //Initialize the global menus
   qDebug() << " - Initialize system menus";
     splash.showScreen("apps");
   if(DEBUG){ qDebug() << " - Init AppMenu:" << timer->elapsed();}
   appmenu = new AppMenu();
+  
+    splash.showScreen("menus");
   if(DEBUG){ qDebug() << " - Init SettingsMenu:" << timer->elapsed();}
-    //splash.showScreen("menus");
   settingsmenu = new SettingsMenu();
   if(DEBUG){ qDebug() << " - Init SystemWindow:" << timer->elapsed();}
   sysWindow = new SystemWindow();
   
+  //Initialize the desktops
+    splash.showScreen("desktop");
+  if(DEBUG){ qDebug() << " - Init Desktops:" << timer->elapsed();}
+  updateDesktops();
+  
   //Now setup the system watcher for changes
     splash.showScreen("final");
   qDebug() << " - Initialize file system watcher";