diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-01-27 12:16:28 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-01-27 12:16:28 +0300 |
| commit | 107f6cb269c6c3e3b4df2c13dc48f0be352ca4f9 (patch) | |
| tree | 0de40608ca04aa56ca15c63f0f56a7bd5f9b60d8 /source/blender/editors/interface | |
| parent | de56a6384957d00c49d5e3846a8bcf7350e96daa (diff) | |
- duplicate window crasheing when it was full screen
- keymap item was missing NULL check crash
- editmode object in inactive layer crash
Diffstat (limited to 'source/blender/editors/interface')
| -rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index bb3709295f8..26215f78754 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -3803,9 +3803,9 @@ static int ui_but_menu(bContext *C, uiBut *but) IDProperty *prop= (but->opptr)? but->opptr->data: NULL; int w = uiLayoutGetWidth(layout); wmKeyMap *km; + wmKeyMapItem *kmi= NULL; int kmi_id= WM_key_event_operator_id(C, but->optype->idname, but->opcontext, prop, 1, &km); - wmKeyMapItem *kmi; - + if (kmi_id) kmi= WM_keymap_item_find_id(km, kmi_id); |