[Bf-blender-cvs] [77cc265f187] blender2.8: Fix crash cancelling search, caused by D3207

[Campbell Barton]

Commit: 77cc265f187299f2538d7c6843aca01257bcae9e
Author: Campbell Barton
Date:   Tue May 8 10:45:50 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB77cc265f187299f2538d7c6843aca01257bcae9e

Fix crash cancelling search, caused by D3207

===================================================================

M	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 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);