cedric pushed a commit to branch enlightenment-0.17.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=5d54123dc5d06877ed499b10bfb9faec41102015

commit 5d54123dc5d06877ed499b10bfb9faec41102015
Author: Mike Blumenkrantz <zm...@samsung.com>
Date:   Sun Dec 1 11:30:43 2013 -0500

    fix menu race condition crash related to screen edges
    
    previously, this conditional would be called on most new submenus, even if 
the submenu's parent item was the previous item and its menu hadn't been set 
yet. hours of small mouse movements revealed that this should never be called 
when the parent item has not yet been set
---
 src/bin/e_menu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bin/e_menu.c b/src/bin/e_menu.c
index eea66a4..7c6531c 100644
--- a/src/bin/e_menu.c
+++ b/src/bin/e_menu.c
@@ -1005,7 +1005,7 @@ e_menu_item_active_set(E_Menu_Item *mi, int active)
           e_menu_item_active_set(pmi, 0);
         if (_e_prev_active_menu_item && (mi != _e_prev_active_menu_item))
           {
-             if (_e_prev_active_menu_item != mi->menu->parent_item)
+             if (mi->menu->parent_item && (_e_prev_active_menu_item != 
mi->menu->parent_item))
                _e_menu_submenu_deactivate(_e_prev_active_menu_item);
           }
         mi->active = 1;

-- 


Reply via email to