diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-05-08 11:45:50 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-05-08 11:48:53 +0300 |
| commit | 77cc265f187299f2538d7c6843aca01257bcae9e (patch) | |
| tree | c71810daf242e00c2e1a526d90a287edfbbde296 | |
| parent | 66b1cd45fb50a13caea40ea25ae41f0edf16d35e (diff) | |
Fix crash cancelling search, caused by D3207
| -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 704a602f6c1..ec2d936472f 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -8497,8 +8497,8 @@ static int ui_handle_button_event(bContext *C, const wmEvent *event, uiBut *but) uiButtonActivateType post_type = data->posttype; /* Reset the button value when empty text is typed. */ - if ((data->str != NULL) && (data->str[0] == '\0') && - ELEM(RNA_property_type(but->rnaprop), PROP_FLOAT, PROP_INT)) + if ((data->cancel == false) && (data->str != NULL) && (data->str[0] == '\0') && + (but->rnaprop && ELEM(RNA_property_type(but->rnaprop), PROP_FLOAT, PROP_INT))) { MEM_SAFE_FREE(data->str); ui_button_value_default(but, &data->value); |