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

dont segv if the border in the winlist that is hilighted is closed 

SVN revision: 15294
This commit is contained in:
Carsten Haitzler 2005-06-13 10:40:37 +00:00
parent dcd18bee06
commit eb79489c31
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/bin/e_winlist.c
View File

@ -298,12 +298,11 @@ _e_winlist_size_adjust(void)
static void
_e_winlist_border_add(E_Border *bd, E_Zone *zone, E_Desk *desk)
{
if ((bd->zone) &&
(bd->zone == zone) &&
((bd->desk == desk) || (bd->sticky)) &&
if ((((bd->zone) && (bd->zone == zone) &&
((bd->desk == desk) || (bd->sticky))) ||
((bd->zone->container == zone->container) && (bd->iconic))) &&
(bd->client.icccm.accepts_focus) &&
(!bd->client.netwm.state.skip_taskbar) &&
(!bd->client.netwm.state.hidden)
(!bd->client.netwm.state.skip_taskbar)
)
{
E_Winlist_Win *ww;
@ -354,6 +353,13 @@ _e_winlist_border_del(E_Border *bd)
ww = l->data;
if (ww->border == bd)
{
if (l == win_selected)
{
win_selected = l->next;
if (!win_selected) win_selected = l->prev;
_e_winlist_show_active();
_e_winlist_activate();
}
evas_object_del(ww->bg_object);
if (ww->icon_object) evas_object_del(ww->icon_object);
free(ww);