winex11.drv: Only initialize static variables once per process.

d7eb2262 · Huw Davies · Alexandre Julliard · 87fbc7a3 · d7eb2262
Commit d7eb2262 authored Oct 24, 2006 by Huw Davies Committed by Alexandre Julliard Oct 24, 2006
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 7 deletions

xim.c dlls/winex11.drv/xim.c +10 -7

No files found.
--- 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;