don't use a null display

Change-Id: Iab0a53abd723f0309f40742636315079a4b2c532
(cherry picked from commit c94d60d6c164e4552b491d348ab0f5c198b6e856)
Signed-off-by: Michael Stahl <mstahl@redhat.com>
Reviewed-on: https://gerrit.libreoffice.org/18444
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>

1 files changed, 14 insertions, 8 deletions

diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx
index 5893cf613d2f..ce097938b2c4 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -491,18 +491,24 @@ public:
     TempErrorHandler(Display* dpy, errorHandler newErrorHandler):
         mdpy(dpy)
     {
-        XLockDisplay(dpy);
-        XSync(dpy, false);
-        oldErrorHandler = XSetErrorHandler(newErrorHandler);
+        if (mdpy)
+        {
+            XLockDisplay(dpy);
+            XSync(dpy, false);
+            oldErrorHandler = XSetErrorHandler(newErrorHandler);
+        }
     }
 
     ~TempErrorHandler()
     {
-        // sync so that we possibly get an XError
-        glXWaitGL();
-        XSync(mdpy, false);
-        XSetErrorHandler(oldErrorHandler);
-        XUnlockDisplay(mdpy);
+        if (mdpy)
+        {
+            // sync so that we possibly get an XError
+            glXWaitGL();
+            XSync(mdpy, false);
+            XSetErrorHandler(oldErrorHandler);
+            XUnlockDisplay(mdpy);
+        }
     }
 };