From: Dana Jansens <danakj@orodu.net>
Date: Sun, 22 Apr 2007 14:16:50 +0000 (+0000)
Subject: merge r5780 from trunk
X-Git-Tag: openbox-3_3_991-RELEASE~242
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=545a0d46db167c323b154a397af5205c40c0f637;p=dana%2Fopenbox.git

merge r5780 from trunk
---

diff --git a/openbox/screen.c b/openbox/screen.c
index d5d61f50..2d34f263 100644
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -300,8 +300,16 @@ void screen_startup(gboolean reconfig)
         screen_num_desktops = 0;
     screen_set_num_desktops(config_desktops_num);
     if (!reconfig) {
-        screen_set_desktop(MIN(config_screen_firstdesk, screen_num_desktops)
-                           - 1);
+        guint32 d;
+        /* start on the current desktop when a wm was already running */
+        if (PROP_GET32(RootWindow(ob_display, ob_screen),
+                       net_current_desktop, cardinal, &d) &&
+            d < screen_num_desktops)
+        {
+            screen_set_desktop(d);
+        } else
+            screen_set_desktop(MIN(config_screen_firstdesk,
+                                   screen_num_desktops) - 1);
 
         /* don't start in showing-desktop mode */
         screen_showing_desktop = FALSE;