From ddada6753836faac170b9613b1d237d937b41ed6 Mon Sep 17 00:00:00 2001
From: Joshua Beck <jxb091000@utdallas.edu>
Date: Thu, 24 Mar 2011 01:50:33 -0500
Subject: [PATCH] winex11: Improved error handling in pglXMakeCurrent() call.

---
 dlls/winex11.drv/opengl.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c
index a9cc1783eaa..b74bc0a42e4 100644
--- a/dlls/winex11.drv/opengl.c
+++ b/dlls/winex11.drv/opengl.c
@@ -344,8 +344,11 @@ static BOOL X11DRV_WineGL_InitOpenglInfo(void)
     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);