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

proper solution for 48487, just order was wrong. 

SVN revision: 48518
This commit is contained in:
Gustavo Sverzut Barbieri 2010-05-01 19:28:27 +00:00
parent a406f496b1
commit df86cee4f0
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/bin/e_menu.c
View File

@ -171,12 +171,6 @@ e_menu_shutdown(void)
{
E_Menu *m;
if (_e_menu_hash)
{
eina_hash_free(_e_menu_hash);
_e_menu_hash = NULL;
}
E_FN_DEL(ecore_event_handler_del, _e_menu_key_down_handler);
E_FN_DEL(ecore_event_handler_del, _e_menu_key_up_handler);
E_FN_DEL(ecore_event_handler_del, _e_menu_mouse_down_handler);
@ -200,6 +194,12 @@ e_menu_shutdown(void)
_e_menu_categories = NULL;
}
if (_e_menu_hash)
{
eina_hash_free(_e_menu_hash);
_e_menu_hash = NULL;
}
return 1;
}
@ -1763,8 +1763,7 @@ _e_menu_unrealize(E_Menu *m)
ecore_evas_free(m->ecore_evas);
m->ecore_evas = NULL;
m->evas = NULL;
if (_e_menu_hash)
eina_hash_del(_e_menu_hash, e_util_winid_str_get(m->evas_win), m);
eina_hash_del(_e_menu_hash, e_util_winid_str_get(m->evas_win), m);
m->evas_win = 0;
}