commit 12a6603136230223e2386aae033fe1e54c9f33e1
author Joshua Beck <jxb091000@utdallas.edu> Thu Mar 24 01:50:33 2011 -0500
committer Alexandre Julliard <julliard@winehq.org> Thu Apr 07 12:53:05 2011 +0200
tree 7ff429d90c4e84325fb753bf11988f5c9ab507d4
parent 3b53dce920f16816ec6408a8c048ca629fedfa1c

winex11: Improved error handling in pglXMakeCurrent() call.
(cherry picked from commit ddada6753836faac170b9613b1d237d937b41ed6)

dlls/winex11.drv/opengl.c

diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c
index fec5cd9..73d3b69 100644
--- a/dlls/winex11.drv/opengl.c
+++ b/dlls/winex11.drv/opengl.c
@@ -343,8 +343,11 @@
     else
         win = root;
 
-    pglXMakeCurrent(gdi_display, win, ctx);
-
+    if(pglXMakeCurrent(gdi_display, win, ctx) == 0)
+    {
+        ERR_(winediag)( "Unable to activate OpenGL context, most likely your OpenGL drivers haven't been installed correctly\n" );
+        goto done;
+    }
     WineGLInfo.glVersion = (const char *) pglGetString(GL_VERSION);
     str = (const char *) pglGetString(GL_EXTENSIONS);
     WineGLInfo.glExtensions = HeapAlloc(GetProcessHeap(), 0, strlen(str)+1);