M openbox/client.c → openbox/client.c

@@ -673,9 +673,13 @@ 
         if (settings->fullscreen != -1)
             self->fullscreen = !!settings->fullscreen;
 
-        if (settings->desktop < screen_num_desktops
-            || settings->desktop == DESKTOP_ALL)
-            self->desktop = settings->desktop;
+        if (settings->desktop) {
+            if (settings->desktop == DESKTOP_ALL)
+                self->desktop = settings->desktop;
+            else if (settings->desktop > 0 &&
+                     settings->desktop <= screen_num_desktops)
+                self->desktop = settings->desktop - 1;
+        }
 
         if (settings->layer == -1) {
             self->below = TRUE;

M openbox/config.c → openbox/config.c

@@ -215,6 +215,7 @@ else {
                         gint i = parse_int(doc, n);
                         if (i > 0)
                             settings->desktop = i;
+                    }
                     g_free(s);
                 } else
                     settings->desktop = 0;