From b3bc99d1b2cb91e36c1740ee88aa2f60fd8bece7 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Sun, 1 Dec 2013 11:30:43 -0500 Subject: [PATCH] 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 d0274a715..efec21f8a 100644 --- a/src/bin/e_menu.c +++ b/src/bin/e_menu.c @@ -1037,7 +1037,7 @@ e_menu_item_active_set(E_Menu_Item *mi, int active) } 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;