(w32_wnd_proc): Don't check context before initializing.

diff --git a/src/ChangeLog b/src/ChangeLog
index 0a1a268d9624dbb5c3631f000e950a8b0e17c1b0..649964178d5fe286e1095a1764dc24de2bd7c4ae 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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 --git a/src/w32fns.c b/src/w32fns.c
index 64d0d8cb6d15456b69a069445fd7106f24a99673..f91ad948828758bd45e41a1274a16846991aab3a 100644 (file)
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -3109,9 +3109,6 @@ w32_wnd_proc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
          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 @@ w32_wnd_proc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
                                - 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);
        }