diff options
| author | Mike Blumenkrantz <michael.blumenkrantz@gmail.com> | 2010-12-22 23:05:47 +0000 |
|---|---|---|
| committer | Mike Blumenkrantz <michael.blumenkrantz@gmail.com> | 2010-12-22 23:05:47 +0000 |
| commit | ecf3a65a09490f95c36c982f7b901a284da93cbb (patch) | |
| tree | 9615fc95b7153e763b3352a2a32e1c66f1d71c74 /src/bin/e_zone.c | |
| parent | 633de9d48d40d52541360fbc7044ef47acf30ca8 (diff) | |
| download | enlightenment-ecf3a65a09490f95c36c982f7b901a284da93cbb.tar.gz | |
move if{} block into another if{} block to avoid null deref
SVN revision: 55715
Diffstat (limited to 'src/bin/e_zone.c')
| -rw-r--r-- | src/bin/e_zone.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/bin/e_zone.c b/src/bin/e_zone.c index 834a0f1094..645b697736 100644 --- a/src/bin/e_zone.c +++ b/src/bin/e_zone.c @@ -1075,25 +1075,25 @@ _e_zone_useful_geometry_calc(E_Zone *zone) if (shelf->cfg->autohide) continue; orient = shelf->cfg->orient; - } - else - orient = shelf->gadcon->orient; - if (shelf->cfg->desk_show_mode) - { - skip_shelf = 1; - EINA_LIST_FOREACH(shelf->cfg->desk_list, ll, sd) + if (shelf->cfg->desk_show_mode) { - if (!sd) continue; - if ((sd->x == zone->desk_x_current) && (sd->y == zone->desk_y_current)) + skip_shelf = 1; + EINA_LIST_FOREACH(shelf->cfg->desk_list, ll, sd) { - skip_shelf = 0; - break; + if (!sd) continue; + if ((sd->x == zone->desk_x_current) && (sd->y == zone->desk_y_current)) + { + skip_shelf = 0; + break; + } } + if (skip_shelf) + continue; } - if (skip_shelf) - continue; } + else + orient = shelf->gadcon->orient; switch (orient) { |