From df86cee4f08f0ae120618daaa18b1cdb6205b02c Mon Sep 17 00:00:00 2001 From: Gustavo Sverzut Barbieri Date: Sat, 1 May 2010 19:28:27 +0000 Subject: [PATCH] proper solution for 48487, just order was wrong. SVN revision: 48518 --- src/bin/e_menu.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/bin/e_menu.c b/src/bin/e_menu.c index a27737c..ebaa1dc 100644 --- a/src/bin/e_menu.c +++ b/src/bin/e_menu.c @@ -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; } -- 2.7.4