X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fscreen.c;h=03cee447e7456c40093da8f37ac4faf6fe6ebe5d;hb=02c7f2e8afbfe5ebc589415a87a2ac156c9ef5af;hp=c941e8daf3270dcd1166dd9ce2c16d7876bf3dfc;hpb=a8b8f2fc80797f05e93440f74cf992013676a2a3;p=chaz%2Fopenbox

diff --git a/openbox/screen.c b/openbox/screen.c
index c941e8da..03cee447 100644
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -1,5 +1,6 @@
 #include "openbox.h"
 #include "prop.h"
+#include "startup.h"
 #include "config.h"
 #include "screen.h"
 #include "client.h"
@@ -173,8 +174,10 @@ void screen_startup()
 
     screen_num_desktops = 0;
     screen_set_num_desktops(config_desktops_num);
-    screen_desktop = 0;
-    screen_set_desktop(0);
+    if (startup_desktop >= screen_num_desktops)
+        startup_desktop = 0;
+    screen_desktop = startup_desktop;
+    screen_set_desktop(startup_desktop);
 
     /* don't start in showing-desktop mode */
     screen_showing_desktop = FALSE;