discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=502662456f3732038a6ddb4e5b12867c9db1f4e4

commit 502662456f3732038a6ddb4e5b12867c9db1f4e4
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Tue Apr 26 16:33:46 2016 -0400

    Revert "handle recursion more effectively in e_menu_hide_all()"
    
    This reverts commit 5764bf680e6f05f6092f7546a326cec7dd68db20.
    
    this was a workaround for a behavior change in efl
---
 src/bin/e_menu.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/bin/e_menu.c b/src/bin/e_menu.c
index f7a4036..cf686ca 100644
--- a/src/bin/e_menu.c
+++ b/src/bin/e_menu.c
@@ -182,10 +182,10 @@ e_menu_shutdown(void)
 E_API void
 e_menu_hide_all(void)
 {
-   while (_e_active_menus)
+   E_Menu *m;
+
+   EINA_LIST_FREE(_e_active_menus, m)
      {
-        E_Menu *m;
-        m = eina_list_data_get(_e_active_menus);
         if (m->post_deactivate_cb.func)
           m->post_deactivate_cb.func(m->post_deactivate_cb.data, m);
         m->active = 0;
@@ -193,7 +193,6 @@ e_menu_hide_all(void)
           e_comp_object_util_autoclose(NULL, NULL, NULL, NULL);
         _e_menu_unrealize(m);
         m->in_active_list = 0;
-        _e_active_menus = eina_list_remove_list(_e_active_menus, 
_e_active_menus);
         e_object_unref(E_OBJECT(m));
      }
 }

-- 


Reply via email to