# HG changeset patch
# User Jason Rumney <jasonr@gnu.org>
# Date 1282229469 -28800
# Node ID 22ddbf1e29549b93216ea7eb37c2c9a1c5cbfa55
# Parent  c39af0d0a8345d95647e59488635924220014934
(w32_wnd_proc): Don't check context before initializing.

diff -r c39af0d0a834 -r 22ddbf1e2954 src/ChangeLog
--- a/src/ChangeLog	Thu Aug 19 11:37:40 2010 +0200
+++ b/src/ChangeLog	Thu Aug 19 22:51:09 2010 +0800
@@ -1,3 +1,7 @@
+2010-08-19  Jason Rumney  <jasonr@gnu.org>
+
+	* w32fns.c (w32_wnd_proc): Don't check context before initializing.
+
 2010-08-19  Jan Djärv  <jan.h.d@swipnet.se>
 
 	* nsselect.m (nxatoms_of_nsselect): Use "Selection" and "Secondary".
diff -r c39af0d0a834 -r 22ddbf1e2954 src/w32fns.c
--- a/src/w32fns.c	Thu Aug 19 11:37:40 2010 +0200
+++ b/src/w32fns.c	Thu Aug 19 22:51:09 2010 +0800
@@ -3109,9 +3109,6 @@
 	  HIMC context;
 	  struct window *w;
 
-	  if (!context)
-	    break;
-
 	  f = x_window_to_frame (dpyinfo, hwnd);
 	  w = XWINDOW (FRAME_SELECTED_WINDOW (f));
 
@@ -3129,6 +3126,10 @@
 				- WINDOW_MODE_LINE_HEIGHT (w));
 
 	  context = get_ime_context_fn (hwnd);
+
+	  if (!context)
+	    break;
+
 	  set_ime_composition_window_fn (context, &form);
 	  release_ime_context_fn (hwnd, context);
 	}