[Bf-blender-cvs] [7d5d971] master: Fix T43920: Crash when clicking into different area during IME composition

Severin noreply at git.blender.org
Mon Mar 9 02:34:15 CET 2015


Commit: 7d5d971dea5bfddaf41222190c43ae198dca6f9b
Author: Severin
Date:   Mon Mar 9 02:22:33 2015 +0100
Branches: master
https://developer.blender.org/rB7d5d971dea5bfddaf41222190c43ae198dca6f9b

Fix T43920: Crash when clicking into different area during IME composition

Fix by @randon

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

M	source/blender/windowmanager/intern/wm_event_system.c

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

diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c
index e3d9ba4..f1a4682 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -3412,7 +3412,9 @@ void wm_event_add_ghostevent(wmWindowManager *wm, wmWindow *win, int type, int U
 		case GHOST_kEventImeCompositionEnd:
 		{
 			event.val = KM_PRESS;
-			win->ime_data->is_ime_composing = false;
+			if (win->ime_data) {
+				win->ime_data->is_ime_composing = false;
+			}
 			event.type = WM_IME_COMPOSITE_END;
 			wm_event_add(win, &event);
 			break;




More information about the Bf-blender-cvs mailing list