don't use a null display

Change-Id: Iab0a53abd723f0309f40742636315079a4b2c532

don't use a null display
Change-Id: Iab0a53abd723f0309f40742636315079a4b2c532
c94d60d6 · Markus Mohrhard · 9a5bd1cc · c94d60d6
Kaydet (Commit) c94d60d6 authored Eyl 07, 2015 tarafından Markus Mohrhard
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 8 deletions

OpenGLContext.cxx vcl/source/opengl/OpenGLContext.cxx +14 -8

No files found.
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -492,18 +492,24 @@ public:
    TempErrorHandler(Display* dpy, errorHandler newErrorHandler):
        mdpy(dpy)
    {
-        XLockDisplay(dpy);
+        if (mdpy)
-        XSync(dpy, false);
+        {
-        oldErrorHandler = XSetErrorHandler(newErrorHandler);
+            XLockDisplay(dpy);
+            XSync(dpy, false);
+            oldErrorHandler = XSetErrorHandler(newErrorHandler);
+        }
    }
    ~TempErrorHandler()
    {
-        // sync so that we possibly get an XError
+        if (mdpy)
-        glXWaitGL();
+        {
-        XSync(mdpy, false);
+            // sync so that we possibly get an XError
-        XSetErrorHandler(oldErrorHandler);
+            glXWaitGL();
-        XUnlockDisplay(mdpy);
+            XSync(mdpy, false);
+            XSetErrorHandler(oldErrorHandler);
+            XUnlockDisplay(mdpy);
+        }
    }
 };