[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56476] trunk/blender/source/blender/ editors/interface/interface_handlers.c: fix for mistake in own commit r56399, it broke click-dragging to open and select a menu item.

[Campbell Barton]

Revision: 56476
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56476
Author:   campbellbarton
Date:     2013-05-02 19:51:32 +0000 (Thu, 02 May 2013)
Log Message:
-----------
fix for mistake in own commit r56399, it broke click-dragging to open and select a menu item.

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56399

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface_handlers.c

Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c	2013-05-02 19:43:52 UTC (rev 56475)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c	2013-05-02 19:51:32 UTC (rev 56476)
@@ -2549,7 +2549,8 @@
 			return WM_UI_HANDLER_BREAK;
 		}
 		else if (event->type == LEFTMOUSE && but->block->handle) {
-			if (!(but->flag & UI_SELECT))
+			/* regular buttons will be 'UI_SELECT', menu items 'UI_ACTIVE' */
+			if (!(but->flag & (UI_SELECT | UI_ACTIVE)))
 				data->cancel = true;
 			button_activate_state(C, but, BUTTON_STATE_EXIT);
 			return WM_UI_HANDLER_BREAK;
@@ -7339,7 +7340,7 @@
 	if ((event->type == TIMER) ||
 	    (/*inside &&*/ (!menu->menuretval || (menu->menuretval & UI_RETURN_UPDATE)) && retval == WM_UI_HANDLER_CONTINUE))
 	{
-		ui_handle_menu_button(C, event, menu);
+		retval = ui_handle_menu_button(C, event, menu);
 	}
 
 	/* if we set a menu return value, ensure we continue passing this on to