X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fscreen.c;h=a32f649f0a5348a64c33d00f31dce70ac9fa1157;hb=1bf9de380991206d4afa104cd31c567583f288c2;hp=a413411a972e38dc2d5240ec4cd167b694326a54;hpb=a6aaabe62c3651169dda9a1a34bcec64dad4ee92;p=chaz%2Fopenbox

diff --git a/openbox/screen.c b/openbox/screen.c
index a413411a..a32f649f 100644
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -28,6 +28,7 @@
 #include "config.h"
 #include "screen.h"
 #include "client.h"
+#include "session.h"
 #include "frame.h"
 #include "event.h"
 #include "focus.h"
@@ -328,7 +329,10 @@ void screen_startup(gboolean reconfig)
             d < screen_num_desktops)
         {
             screen_set_desktop(d);
-        } else
+        } else if (session_desktop >= 0)
+            screen_set_desktop(MIN((guint)session_desktop,
+                                   screen_num_desktops));
+        else
             screen_set_desktop(MIN(config_screen_firstdesk,
                                    screen_num_desktops) - 1);