Commit d7eb2262 authored by Huw Davies's avatar Huw Davies Committed by Alexandre Julliard

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

parent 87fbc7a3
...@@ -430,17 +430,20 @@ XIM X11DRV_SetupXIM(Display *display, const char *input_style) ...@@ -430,17 +430,20 @@ XIM X11DRV_SetupXIM(Display *display, const char *input_style)
ximStyleCallback = ximStyle; ximStyleCallback = ximStyle;
} }
} }
wine_tsx11_unlock(); wine_tsx11_unlock();
LoadImmDll(); if(!hImmDll)
if (pImmCreateContext)
{ {
root_context = pImmCreateContext(); LoadImmDll();
if (pImmAssociateContext)
pImmAssociateContext(0,root_context); if (pImmCreateContext)
{
root_context = pImmCreateContext();
if (pImmAssociateContext)
pImmAssociateContext(0,root_context);
}
} }
return xim; return xim;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment