From d7eb2262b08cdd379e9c322b2abac807ce2d4491 Mon Sep 17 00:00:00 2001
From: Huw Davies <huw@codeweavers.com>
Date: Tue, 24 Oct 2006 12:32:00 +0100
Subject: [PATCH] winex11.drv: Only initialize static variables once per
 process.

---
 dlls/winex11.drv/xim.c | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c
index 4d0b7ad663e..ff98f017214 100644
--- a/dlls/winex11.drv/xim.c
+++ b/dlls/winex11.drv/xim.c
@@ -430,17 +430,20 @@ XIM X11DRV_SetupXIM(Display *display, const char *input_style)
             ximStyleCallback = ximStyle;
         }
 
-        }
+    }
 
     wine_tsx11_unlock();
 
-    LoadImmDll();
-
-    if (pImmCreateContext)
+    if(!hImmDll)
     {
-        root_context = pImmCreateContext();
-        if (pImmAssociateContext)
-            pImmAssociateContext(0,root_context);
+        LoadImmDll();
+
+        if (pImmCreateContext)
+        {
+            root_context = pImmCreateContext();
+            if (pImmAssociateContext)
+                pImmAssociateContext(0,root_context);
+        }
     }
 
     return xim;
-- 
2.11.4.GIT