diff src/w32fns.c @ 109891:373abedd1f02

merge from upstream

--- a/src/w32fns.c	Fri Aug 20 21:55:21 2010 +0200
+++ b/src/w32fns.c	Fri Aug 20 22:00:00 2010 +0200
@@ -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);
 	}