raise windows smartly when merging desktops

1 files changed, 3 insertions, 2 deletions

diff --git a/openbox/screen.c b/openbox/screen.c
index 720fc049..f9b1eb6c 100644
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -526,8 +526,9 @@ void screen_set_num_desktops(guint num)
                 client_set_desktop(c, num - 1, FALSE, TRUE);
             /* raise all the windows that are on the current desktop which
                is being merged */
-            else if (c->desktop == DESKTOP_ALL ||
-                     c->desktop == num - 1)
+            else if (screen_desktop == num - 1 &&
+                     (c->desktop == DESKTOP_ALL ||
+                      c->desktop == screen_desktop))
                 stacking_raise(WINDOW_AS_CLIENT(c));
         }
     }