2.5

[blender-staging.git] / 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 1736cd1ef529dc5cf116fdfb798a79f1500dca88..0987f0d2f2a8f6c47da5335f52194c622582c38f 100644 (file)
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -1805,7 +1805,10 @@ static int ui_do_but_KEYEVT(bContext *C, uiBut *but, uiHandleButtonData *data, w
 {
        if(data->state == BUTTON_STATE_HIGHLIGHT) {
                if(ELEM3(event->type, LEFTMOUSE, PADENTER, RETKEY) && event->val==KM_PRESS) {
-                       button_activate_state(C, but, BUTTON_STATE_WAIT_KEY_EVENT);
+                       short event= (short)ui_get_but_val(but);
+                       /* hardcoded prevention from editing or assigning ESC */
+                       if(event!=ESCKEY)
+                               button_activate_state(C, but, BUTTON_STATE_WAIT_KEY_EVENT);
                        return WM_UI_HANDLER_BREAK;
                }
        }
@@ -1814,7 +1817,7 @@ static int ui_do_but_KEYEVT(bContext *C, uiBut *but, uiHandleButtonData *data, w
                        return WM_UI_HANDLER_CONTINUE;
 
                if(event->val==KM_PRESS) {
-                       if(WM_key_event_string(event->type)[0])
+                       if(event->type!=ESCKEY && WM_key_event_string(event->type)[0])
                                ui_set_but_val(but, event->type);
                        else
                                data->cancel= 1;