raster pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=c3791d6b43584f3c2524c8cf4e61e65a41c542aa

commit c3791d6b43584f3c2524c8cf4e61e65a41c542aa
Author: Carsten Haitzler (Rasterman) <[email protected]>
Date:   Wed Feb 5 08:49:38 2014 +0900

    stop crash on accessing ec->desk if its null
    
    unknown if this was a bug before - never saw it before, so for now
    shal assume it's new.
---
 src/bin/e_desk.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/bin/e_desk.c b/src/bin/e_desk.c
index 8f72c1a..d6e9ffb 100644
--- a/src/bin/e_desk.c
+++ b/src/bin/e_desk.c
@@ -829,7 +829,9 @@ _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);
@@ -873,7 +875,9 @@ _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))

-- 


Reply via email to