[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33696] trunk/blender/source/blender/ editors/interface/interface_handlers.c: Bugfix #25243

[Ton Roosendaal]

Revision: 33696
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33696
Author:   ton
Date:     2010-12-15 20:10:42 +0100 (Wed, 15 Dec 2010)

Log Message:
-----------
Bugfix #25243

Pressing Enter twice on enum-menus or pulldowns sent an 'OK execute'
with illegal values (no menu item active). Caused crashes too.

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-12-15 18:23:10 UTC (rev 33695)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c 
2010-12-15 19:10:42 UTC (rev 33696)
@@ -5726,10 +5726,10 @@
                                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);


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs