From ec1ef77b267b2197fbf9b380713debd06a742c13 Mon Sep 17 00:00:00 2001
From: Juan Lang <juan_lang@yahoo.com>
Date: Thu, 28 Sep 2006 17:02:42 -0700
Subject: [PATCH] winex11.drv: Don't deadlock if GL init fails.

---
 dlls/winex11.drv/opengl.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c
index b90f760db72..b77246872bb 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;
 }