From ca760bb10350186cb040670b455c1f2e636c7219 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 4 Feb 2014 21:29:29 -0500 Subject: [PATCH] check client ignores before dereferencing desk D519 --- src/bin/e_desk.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bin/e_desk.c b/src/bin/e_desk.c index 962cb8f28..ecfc08a15 100644 --- a/src/bin/e_desk.c +++ b/src/bin/e_desk.c @@ -830,7 +830,7 @@ _e_desk_show_begin(E_Desk *desk, int dx, int dy) } E_CLIENT_FOREACH(desk->zone->comp, ec) { - if ((ec->desk->zone != desk->zone) || (ec->iconic) || e_client_util_ignored_get(ec)) continue; + if (e_client_util_ignored_get(ec) || (ec->desk->zone != desk->zone) || (ec->iconic)) continue; if (ec->moving) { e_client_desk_set(ec, desk); @@ -874,7 +874,7 @@ _e_desk_hide_begin(E_Desk *desk, int dx, int dy) } E_CLIENT_FOREACH(desk->zone->comp, ec) { - if ((ec->desk->zone != desk->zone) || (ec->iconic) || e_client_util_ignored_get(ec)) continue; + if (e_client_util_ignored_get(ec) || (ec->desk->zone != desk->zone) || (ec->iconic)) continue; if (ec->moving) continue; if ((ec->desk != desk) || (ec->sticky)) continue; if ((!starting) && _e_desk_transition_setup(ec, -dx, -dy, 0))