Juan Lang : winex11.drv: Don't deadlock if GL init fails.
Alexandre Julliard
julliard at wine.codeweavers.com
Fri Sep 29 09:45:59 CDT 2006
Module: wine
Branch: master
Commit: ec1ef77b267b2197fbf9b380713debd06a742c13
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ec1ef77b267b2197fbf9b380713debd06a742c13
Author: Juan Lang <juan_lang at yahoo.com>
Date: Thu Sep 28 17:02:42 2006 -0700
winex11.drv: Don't deadlock if GL init fails.
---
dlls/winex11.drv/opengl.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c
index b90f760..b772468 100644
--- a/dlls/winex11.drv/opengl.c
+++ b/dlls/winex11.drv/opengl.c
@@ -278,6 +278,7 @@ BOOL X11DRV_WineGL_InitOpenglInfo()
pglXMakeCurrent(gdi_display, win, ctx);
} else {
ERR(" couldn't initialize OpenGL, expect problems\n");
+ wine_tsx11_unlock();
return FALSE;
}
@@ -302,12 +303,12 @@ BOOL X11DRV_WineGL_InitOpenglInfo()
TRACE("Client GLX version : %s.\n", WineGLInfo.glxClientVersion);
TRACE("Direct rendering enabled: %s\n", WineGLInfo.glxDirect ? "True" : "False");
- wine_tsx11_unlock();
if(vis) XFree(vis);
if(ctx) {
pglXMakeCurrent(gdi_display, None, NULL);
pglXDestroyContext(gdi_display, ctx);
}
+ wine_tsx11_unlock();
return TRUE;
}
More information about the wine-cvs
mailing list