[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47346] branches/soc-2012-bratwurst/source /blender/editors/interface/interface_handlers.c: Fix for r47301

[Jorge Rodriguez]

Revision: 47346
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47346
Author:   vino
Date:     2012-06-02 16:52:01 +0000 (Sat, 02 Jun 2012)
Log Message:
-----------
Fix for r47301

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

Modified Paths:
--------------
    branches/soc-2012-bratwurst/source/blender/editors/interface/interface_handlers.c

Modified: branches/soc-2012-bratwurst/source/blender/editors/interface/interface_handlers.c
===================================================================
--- branches/soc-2012-bratwurst/source/blender/editors/interface/interface_handlers.c	2012-06-02 00:16:23 UTC (rev 47345)
+++ branches/soc-2012-bratwurst/source/blender/editors/interface/interface_handlers.c	2012-06-02 16:52:01 UTC (rev 47346)
@@ -6368,7 +6368,7 @@
 	/* if we set a menu return value, ensure we continue passing this on to
 	 * lower menus and buttons, so always set continue then, and if we are
 	 * inside the region otherwise, ensure we swallow the event */
-	if (menu->menuretval != UI_RETURN_UPDATE)
+	if (menu->menuretval && menu->menuretval != UI_RETURN_UPDATE)
 		return WM_UI_HANDLER_CONTINUE;
 	else if (inside)
 		return WM_UI_HANDLER_BREAK;