* src/netwm.c: Keep window layer when status is above, below or

	  fullscreen (Bug #5030)

(Old svn revision: 29688)

1 files changed, 8 insertions, 5 deletions

diff --git a/src/netwm.c b/src/netwm.c
index dc15a1bdd..1f127ae1b 100644
--- a/src/netwm.c
+++ b/src/netwm.c
@@ -1309,11 +1309,14 @@ clientWindowType (Client * c)
         }
         FLAG_UNSET (c->xfwm_flags, XFWM_FLAG_HAS_HIDE);
     }
-    if ((old_type != c->type) || (c->initial_layer != c->win_layer))
+    if (!FLAG_TEST (c->flags, CLIENT_FLAG_ABOVE|CLIENT_FLAG_BELOW|CLIENT_FLAG_FULLSCREEN))
     {
-        TRACE ("setting layer %i", c->initial_layer);
-        clientSetLayer (c, c->initial_layer);
-        clientSetNetState (c);
+        if ((old_type != c->type) || (c->initial_layer != c->win_layer))
+        {
+            TRACE ("setting layer %i", c->initial_layer);
+            clientSetLayer (c, c->initial_layer);
+            clientSetNetState (c);
+        }
     }
 }
 
@@ -1468,7 +1471,7 @@ clientGetUserTime (Client * c)
     if (getNetWMUserTime (display_info, c->user_time_win, &c->user_time))
     {
         guint32 last_user_time;
-        
+
         last_user_time = myDisplayGetLastUserTime (display_info);
         if (c->user_time && TIMESTAMP_IS_BEFORE(last_user_time, c->user_time))
         {