Skip to content

W
wine-cw
Commit ec1ef77b authored by Juan Lang's avatar Juan Lang Committed by Alexandre Julliard
Browse files
Options

winex11.drv: Don't deadlock if GL init fails.

parent 32378f7c
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
dlls/winex11.drv/opengl.c
View file @ ec1ef77b
...@@ -278,6 +278,7 @@ BOOL X11DRV_WineGL_InitOpenglInfo() ...@@ -278,6 +278,7 @@ BOOL X11DRV_WineGL_InitOpenglInfo()
pglXMakeCurrent(gdi_display, win, ctx); pglXMakeCurrent(gdi_display, win, ctx);
} else { } else {
ERR(" couldn't initialize OpenGL, expect problems\n"); ERR(" couldn't initialize OpenGL, expect problems\n");
wine_tsx11_unlock();
return FALSE; return FALSE;
} }
...@@ -302,12 +303,12 @@ BOOL X11DRV_WineGL_InitOpenglInfo() ...@@ -302,12 +303,12 @@ BOOL X11DRV_WineGL_InitOpenglInfo()
TRACE("Client GLX version : %s.\n", WineGLInfo.glxClientVersion); TRACE("Client GLX version : %s.\n", WineGLInfo.glxClientVersion);
TRACE("Direct rendering enabled: %s\n", WineGLInfo.glxDirect ? "True" : "False"); TRACE("Direct rendering enabled: %s\n", WineGLInfo.glxDirect ? "True" : "False");
wine_tsx11_unlock();
if(vis) XFree(vis); if(vis) XFree(vis);
if(ctx) { if(ctx) {
pglXMakeCurrent(gdi_display, None, NULL); pglXMakeCurrent(gdi_display, None, NULL);
pglXDestroyContext(gdi_display, ctx); pglXDestroyContext(gdi_display, ctx);
} }
wine_tsx11_unlock();
return TRUE; return TRUE;
} }
......
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