styx
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Check that zone exists first before trying to use it. 

No need to set border zone twice here.



SVN revision: 44640
This commit is contained in:
Christopher Michael 2009-12-21 20:54:09 +00:00
parent f9f0e3f2fb
commit 0007331545
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bin/e_border.c
View File

@ -494,7 +494,7 @@ e_border_new(E_Container *con, Ecore_X_Window win, int first_map, int internal)
bd->new_client = 1;
bd->changed = 1;
bd->zone = e_zone_current_get(con);
// bd->zone = e_zone_current_get(con);
bd->desk = e_desk_current_get(bd->zone);
e_container_border_add(bd);
borders = eina_list_append(borders, bd);
@ -626,9 +626,9 @@ e_border_zone_set(E_Border *bd, E_Zone *zone)
E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE);
E_OBJECT_CHECK(zone);
E_OBJECT_TYPE_CHECK(zone, E_ZONE_TYPE);
if (bd->zone == zone) return;
if (!zone) return;
if (bd->zone == zone) return;
/* if the window does not lie in the new zone, move it so that it does */
if (!E_INTERSECTS(bd->x, bd->y, bd->w, bd->h, zone->x, zone->y, zone->w, zone->h))
{