Skip to content

W
wine-cw
Commit 844c804b authored by Huw Davies's avatar Huw Davies Committed by Alexandre Julliard
Browse files
Options

Move desktop_vi inside process_attach and remember to free it.

parent 94fbe09c
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
dlls/x11drv/x11drv_main.c
View file @ 844c804b
...@@ -89,7 +89,6 @@ DWORD thread_data_tls_index = TLS_OUT_OF_INDEXES; ...@@ -89,7 +89,6 @@ DWORD thread_data_tls_index = TLS_OUT_OF_INDEXES;
static BOOL synchronous; /* run in synchronous mode? */ static BOOL synchronous; /* run in synchronous mode? */
static BOOL desktop_dbl_buf = TRUE; static BOOL desktop_dbl_buf = TRUE;
static char *desktop_geometry; static char *desktop_geometry;
static XVisualInfo *desktop_vi;
static x11drv_error_callback err_callback; /* current callback for error */ static x11drv_error_callback err_callback; /* current callback for error */
static Display *err_callback_display; /* display callback is set for */ static Display *err_callback_display; /* display callback is set for */
...@@ -374,6 +373,7 @@ static void setup_options(void) ...@@ -374,6 +373,7 @@ static void setup_options(void)
static BOOL process_attach(void) static BOOL process_attach(void)
{ {
Display *display; Display *display;
XVisualInfo *desktop_vi = NULL;
setup_options(); setup_options();
...@@ -429,6 +429,8 @@ static BOOL process_attach(void) ...@@ -429,6 +429,8 @@ static BOOL process_attach(void)
root_window = X11DRV_create_desktop( desktop_vi, desktop_geometry ); root_window = X11DRV_create_desktop( desktop_vi, desktop_geometry );
using_wine_desktop = 1; using_wine_desktop = 1;
} }
if(desktop_vi)
XFree(desktop_vi);
#ifdef HAVE_LIBXXF86VM #ifdef HAVE_LIBXXF86VM
/* initialize XVidMode */ /* initialize XVidMode */
......
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