From 66325b22077fc4b0cf5c469fc0f95565ae650a0b Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Wed, 5 Feb 2014 12:47:03 -0500 Subject: [PATCH] Revert "stop crash on accessing ec->desk if its null" This reverts commit c3791d6b43584f3c2524c8cf4e61e65a41c542aa. this is a workaround which prevents the underlying bug from being fixed. --- src/bin/e_desk.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/bin/e_desk.c b/src/bin/e_desk.c index d6e9ffb..8f72c1a 100644 --- a/src/bin/e_desk.c +++ b/src/bin/e_desk.c @@ -829,9 +829,7 @@ _e_desk_show_begin(E_Desk *desk, int dx, int dy) } E_CLIENT_FOREACH(desk->zone->comp, ec) { - if (!ec->desk) continue; if (e_client_util_ignored_get(ec) || (ec->desk->zone != desk->zone) || (ec->iconic)) continue; - if ((ec->desk->zone != desk->zone) || (ec->iconic) || e_client_util_ignored_get(ec)) continue; if (ec->moving) { e_client_desk_set(ec, desk); @@ -875,9 +873,7 @@ _e_desk_hide_begin(E_Desk *desk, int dx, int dy) } E_CLIENT_FOREACH(desk->zone->comp, ec) { - if (!ec->desk) continue; if (e_client_util_ignored_get(ec) || (ec->desk->zone != desk->zone) || (ec->iconic)) continue; - if ((ec->desk->zone != desk->zone) || (ec->iconic) || e_client_util_ignored_get(ec)) continue; if (ec->moving) continue; if ((ec->desk != desk) || (ec->sticky)) continue; if ((!starting) && _e_desk_transition_setup(ec, -dx, -dy, 0)) -- 2.7.4