[mapserver-commits] r11481 - trunk/mapserver

[svn at osgeo.org]

Author: rouault
Date: 2011-04-06 14:50:35 -0700 (Wed, 06 Apr 2011)
New Revision: 11481

Modified:
   trunk/mapserver/mapoglcontext.cpp
Log:
opengl rendered: error out properly if XOpenDisplay() fails

Modified: trunk/mapserver/mapoglcontext.cpp
===================================================================
--- trunk/mapserver/mapoglcontext.cpp	2011-04-06 19:04:51 UTC (rev 11480)
+++ trunk/mapserver/mapoglcontext.cpp	2011-04-06 21:50:35 UTC (rev 11481)
@@ -424,6 +424,11 @@
 	}
 
 	window = XOpenDisplay(display_name);
+    if (!window)
+    {
+        msSetError(MS_OGLERR, "XOpenDisplay() failed.", "OglContext::init()");
+        return false;
+    }
 
 	const int fb_attributes[] = {
 			GLX_RENDER_TYPE, GLX_RGBA_BIT,