[Bf-blender-cvs] [3341d42ad56] blender2.8: Fix T56947: Copy text from disabled search menu crashed

[Jacques Lucke]

Commit: 3341d42ad5669edde09025043be9a221f7ee789b
Author: Jacques Lucke
Date:   Fri Sep 28 14:12:00 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB3341d42ad5669edde09025043be9a221f7ee789b

Fix T56947: Copy text from disabled search menu crashed

Reviewers: brecht

Differential Revision: https://developer.blender.org/D3745

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

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 bff43e5cbaa..c08384c3ef0 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -2224,12 +2224,9 @@ static void ui_but_paste_color(bContext *C, uiBut *but, char *buf_paste)
 	}
 }
 
-static void ui_but_copy_text(bContext *C, uiBut *but, char *output, int max_output_len)
+static void ui_but_copy_text(uiBut *but, char *output, int max_output_len)
 {
-	button_activate_state(C, but, BUTTON_STATE_TEXT_EDITING);
-	strncpy(output, but->active->str, max_output_len);
-	but->active->cancel = true;
-	button_activate_state(C, but, BUTTON_STATE_EXIT);
+	ui_but_string_get(but, output, max_output_len);
 }
 
 static void ui_but_paste_text(bContext *C, uiBut *but, uiHandleButtonData *data, char *buf_paste)
@@ -2342,7 +2339,7 @@ static void ui_but_copy(bContext *C, uiBut *but, const bool copy_array)
 	case UI_BTYPE_TEXT:
 	case UI_BTYPE_SEARCH_MENU:
 		if (!has_required_data) break;
-		ui_but_copy_text(C, but, buffer_to_copy, max_copy_length);
+		ui_but_copy_text(but, buffer_to_copy, max_copy_length);
 		break;
 
 	case UI_BTYPE_COLORBAND: