[Bf-blender-cvs] [936c176] master: Fix T48743: Broken menu key accelerators

[Campbell Barton]

Commit: 936c176a7137eb58900236e134c3ad5615e30b02
Author: Campbell Barton
Date:   Mon Jun 27 14:08:36 2016 +1000
Branches: master
https://developer.blender.org/rB936c176a7137eb58900236e134c3ad5615e30b02

Fix T48743: Broken menu key accelerators

Regression caused by fc96110b

===================================================================

M	source/blender/editors/interface/interface_handlers.c

===================================================================

diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index dd82389..f941993 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -9813,10 +9813,17 @@ static int ui_handle_menus_recursive(
 				retval = ui_pie_handler(C, event, menu);
 			}
 			else if (event->type == LEFTMOUSE || event->val != KM_DBL_CLICK) {
+				bool handled = false;
+
 				if (listbox) {
-					retval = ui_handle_list_event(C, event, menu->region, listbox);
+					int retval_test = ui_handle_list_event(C, event, menu->region, listbox);
+					if (retval_test != WM_UI_HANDLER_CONTINUE) {
+						retval = retval_test;
+						handled = true;
+					}
 				}
-				if (retval == WM_UI_HANDLER_CONTINUE) {
+
+				if (handled == false) {
 					retval = ui_handle_menu_event(
 					        C, event, menu, level,
 					        is_parent_inside, is_parent_menu, is_floating);