add error handler again

stevenlovegrove · Jul 26, 2018 · 893c862 · 893c862
1 parent 850a23a
commit 893c862
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/display/device/display_x11.cpp b/src/display/device/display_x11.cpp
@@ -127,6 +127,12 @@ static int ctxErrorHandler( ::Display * /*dpy*/, ::XErrorEvent * ev )
 
 X11GlContext::X11GlContext(std::shared_ptr<X11Display>& xdisplay) : display(xdisplay)
 {
+
+    // Install an X error handler so the application won't exit if GL 3.0
+    // context allocation fails. Handler is global and shared across all threads.
+    ctxErrorOccurred = false;
+    XSetErrorHandler(&ctxErrorHandler);
+
     EGLint ignore;
     EGLBoolean ok;