forgot to check if perapp settings said to put window on all desktops

diff --git a/openbox/client.c b/openbox/client.c
index 060548bf7a4006c32122c0aa91d0a4d694ddf446..08b09c93f68d4eddf26603187a6d2bba79894ec6 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -359,7 +359,8 @@ void client_manage(Window window)
         if (settings->fullscreen != -1)
             client_fullscreen(self, !!settings->fullscreen, TRUE);
 
-        if (settings->desktop < screen_num_desktops)
+        if (settings->desktop < screen_num_desktops
+            || settings->desktop == DESKTOP_ALL)
             client_set_desktop(self, settings->desktop, FALSE);
 
         if (settings->layer > -2 && settings->layer < 2)

diff --git a/openbox/config.c b/openbox/config.c
index e8e4edff8d17acdc99eade8cce36c21e83624512..e0cb1819d7f6068788611ca596bc97dd2e5071e8 100644 (file)
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -133,6 +133,7 @@ static void parse_per_app_settings(ObParseInst *i, xmlDocPtr doc,
                 settings->name = name;
             else
                 settings->name = NULL;
+
             if (class_set)
                 settings->class = class;
             else