From 97b0e1757730c5db0a0343a35bdeea1d5bd55eab Mon Sep 17 00:00:00 2001 From: Ton Roosendaal Date: Wed, 15 Dec 2010 19:10:42 +0000 Subject: [PATCH] Bugfix #25243 Pressing Enter twice on enum-menus or pulldowns sent an 'OK execute' with illegal values (no menu item active). Caused crashes too. --- source/blender/editors/interface/interface_handlers.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 77782e56f23..d66f7d262a9 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -5726,10 +5726,10 @@ int ui_handle_menu_event(bContext *C, wmEvent *event, uiPopupBlockHandle *menu, menu->menuretval= UI_RETURN_CANCEL; } else if(ELEM(event->type, RETKEY, PADENTER) && event->val==KM_PRESS) { - /* enter will always close this block, but we let the event - * get handled by the button if it is activated */ + /* enter will always close this block, we let the event + * get handled by the button if it is activated, otherwise we cancel */ if(!ui_but_find_activated(ar)) - menu->menuretval= UI_RETURN_OK; + menu->menuretval= UI_RETURN_CANCEL; } else { ui_mouse_motion_towards_check(block, menu, mx, my);