proper cleanup on icon/edje failure.

SVN revision: 40201
This commit is contained in:
Gustavo Sverzut Barbieri 2009-04-18 23:45:26 +00:00
parent 84a4e7a5e5
commit 69821ee547
1 changed files with 9 additions and 1 deletions

View File

@ -1237,7 +1237,10 @@ _e_menu_item_realize(E_Menu_Item *mi)
evas_object_show(o);
}
else
evas_object_del(o);
{
evas_object_del(o);
o = NULL;
}
/* FIXME: Not sure why there are two different tries to get the icon size, surely only the last one si needed. */
/* FIXME: Do it this way later, when e_app_icon_add() just registers a request for an icon to be filled in when it's ready.
@ -1264,6 +1267,11 @@ _e_menu_item_realize(E_Menu_Item *mi)
icon_w = iww;
icon_h = ihh;
}
else
{
evas_object_del(o);
o = NULL;
}
}
if (!mi->icon_object)
{