[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26420] trunk/blender/source/blender/ editors/interface/interface_handlers.c: Fix #19904: selecting a new image color closes the popup.

[Brecht Van Lommel]

Revision: 26420
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26420
Author:   blendix
Date:     2010-01-30 10:18:59 +0100 (Sat, 30 Jan 2010)

Log Message:
-----------
Fix #19904: selecting a new image color closes the popup.

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	2010-01-30 09:17:32 UTC (rev 26419)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c	2010-01-30 09:18:59 UTC (rev 26420)
@@ -5254,7 +5254,7 @@
 
 	/* if we are didn't handle the event yet, lets pass it on to
 	 * buttons inside this region. disabled inside check .. not sure
-	 * anymore why it was there? but i meant enter enter didn't work
+	 * anymore why it was there? but it meant enter didn't work
 	 * for example when mouse was not over submenu */
 	if((/*inside &&*/ (!menu->menuretval || menu->menuretval == UI_RETURN_UPDATE) && retval == WM_UI_HANDLER_CONTINUE) || event->type == TIMER) {
 		but= ui_but_find_activated(ar);
@@ -5313,8 +5313,6 @@
 		}
 
 		update= (submenu->menuretval == UI_RETURN_UPDATE);
-		if(update)
-			menu->menuretval = UI_RETURN_UPDATE;
 
 		/* now let activated button in this menu exit, which
 		 * will actually close the submenu too */