Huw Davies : winex11.drv: Initialize data->
xim to NULL if xim has been disabled.
Alexandre Julliard
julliard at wine.codeweavers.com
Tue Oct 24 04:55:29 CDT 2006
Module: wine
Branch: master
Commit: becf09f3f8450321b42fd1adc162aba0ed386204
URL: http://source.winehq.org/git/wine.git/?a=commit;h=becf09f3f8450321b42fd1adc162aba0ed386204
Author: Huw Davies <huw at codeweavers.com>
Date: Mon Oct 23 18:00:06 2006 +0100
winex11.drv: Initialize data->xim to NULL if xim has been disabled.
---
dlls/winex11.drv/x11drv_main.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c
index 979b7f1..a33a374 100644
--- a/dlls/winex11.drv/x11drv_main.c
+++ b/dlls/winex11.drv/x11drv_main.c
@@ -534,7 +534,9 @@ #endif
if (TRACE_ON(synchronous)) XSynchronize( data->display, True );
wine_tsx11_unlock();
- if (use_xim && !(data->xim = X11DRV_SetupXIM( data->display, input_style )))
+ if (!use_xim)
+ data->xim = NULL;
+ else if (!(data->xim = X11DRV_SetupXIM( data->display, input_style )))
WARN("Input Method is not available\n");
if (wine_server_fd_to_handle( ConnectionNumber(data->display), GENERIC_READ | SYNCHRONIZE,
More information about the wine-cvs
mailing list