we were always overwriting the last desktop name

[chaz/openbox] / openbox / client.c

diff --git a/openbox/client.c b/openbox/client.c
index 9c06e49e34d38e0bc50ee83b011eea47f25adab1..3b66a836f629d17b8903fa0546e68ee639b8bcda 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -2143,9 +2143,11 @@ static void client_change_wm_state(ObClient *self)
 
     old = self->wmstate;
 
-    if (self->shaded || self->iconic)
+    if (self->shaded || self->iconic ||
+        (self->desktop != DESKTOP_ALL && self->desktop != screen_desktop))
+    {
         self->wmstate = IconicState;
-    else
+    } else
         self->wmstate = NormalState;
 
     if (old != self->wmstate) {