From ecf3a65a09490f95c36c982f7b901a284da93cbb Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Wed, 22 Dec 2010 23:05:47 +0000 Subject: [PATCH] move if{} block into another if{} block to avoid null deref SVN revision: 55715 --- src/bin/e_zone.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/bin/e_zone.c b/src/bin/e_zone.c index 834a0f109..645b69773 100644 --- a/src/bin/e_zone.c +++ b/src/bin/e_zone.c @@ -1075,26 +1075,26 @@ _e_zone_useful_geometry_calc(E_Zone *zone) if (shelf->cfg->autohide) continue; orient = shelf->cfg->orient; + + if (shelf->cfg->desk_show_mode) + { + skip_shelf = 1; + EINA_LIST_FOREACH(shelf->cfg->desk_list, ll, sd) + { + if (!sd) continue; + if ((sd->x == zone->desk_x_current) && (sd->y == zone->desk_y_current)) + { + skip_shelf = 0; + break; + } + } + if (skip_shelf) + continue; + } } else orient = shelf->gadcon->orient; - if (shelf->cfg->desk_show_mode) - { - skip_shelf = 1; - EINA_LIST_FOREACH(shelf->cfg->desk_list, ll, sd) - { - if (!sd) continue; - if ((sd->x == zone->desk_x_current) && (sd->y == zone->desk_y_current)) - { - skip_shelf = 0; - break; - } - } - if (skip_shelf) - continue; - } - switch (orient) { /* these are non-edje orientations */