summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2015-09-07 10:19:30 -0400
committerMike Blumenkrantz <zmike@osg.samsung.com>2015-09-07 13:47:51 -0400
commitdc35b11619b023b5d4c3376aaef8e59fffcfbbd9 (patch)
tree98ee06f0a64e60b94dda7a58f483d1214cf50a4d
parent44fa419a8cb2c1872130c01bd31fdf57d958c325 (diff)
reorder ds client iterator filter to catch override clients before ec->desk deref
ref D3024 and @Samis2001
-rw-r--r--src/desksanity.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/desksanity.c b/src/desksanity.c
index 90612f3..59f20e7 100644
--- a/src/desksanity.c
+++ b/src/desksanity.c
@@ -72,7 +72,7 @@ _ds_show(E_Desk *desk, int dx, int dy)
72 E_CLIENT_FOREACH(desk->zone->comp, ec) 72 E_CLIENT_FOREACH(desk->zone->comp, ec)
73 { 73 {
74 /* skip clients from other screens, iconic clients, and ignorable clients */ 74 /* skip clients from other screens, iconic clients, and ignorable clients */
75 if ((ec->desk->zone != desk->zone) || (ec->iconic) || e_client_util_ignored_get(ec)) continue; 75 if (e_client_util_ignored_get(ec) || (ec->desk->zone != desk->zone) || (ec->iconic)) continue;
76 /* always keep user-moving clients visible */ 76 /* always keep user-moving clients visible */
77 if (ec->moving) 77 if (ec->moving)
78 { 78 {
@@ -397,7 +397,7 @@ _ds_hide(E_Desk *desk)
397 E_CLIENT_FOREACH(desk->zone->comp, ec) 397 E_CLIENT_FOREACH(desk->zone->comp, ec)
398 { 398 {
399 /* same as above */ 399 /* same as above */
400 if ((ec->desk->zone != desk->zone) || (ec->iconic) || e_client_util_ignored_get(ec)) continue; 400 if (e_client_util_ignored_get(ec) || (ec->desk->zone != desk->zone) || (ec->iconic)) continue;
401 if (ec->moving) continue; 401 if (ec->moving) continue;
402 if ((ec->desk != desk) || (ec->sticky)) continue; 402 if ((ec->desk != desk) || (ec->sticky)) continue;
403 /* comp hide clients */ 403 /* comp hide clients */