don't use a null display

Change-Id: Iab0a53abd723f0309f40742636315079a4b2c532
(cherry picked from commit c94d60d6)
Signed-off-by: Michael Stahl <mstahl@redhat.com>

vcl/source/opengl/OpenGLContext.cxx

@@ -464,13 +464,18 @@ private:
 public:
     TempErrorHandler(Display* dpy, errorHandler newErrorHandler):
         mdpy(dpy)
+    {
+        if (mdpy)
         {
             XLockDisplay(dpy);
             XSync(dpy, false);
             oldErrorHandler = XSetErrorHandler(newErrorHandler);
         }
+    }
 
     ~TempErrorHandler()
+    {
+        if (mdpy)
         {
             // sync so that we possibly get an XError
             glXWaitGL();
@@ -478,6 +483,7 @@ public:
             XSetErrorHandler(oldErrorHandler);
             XUnlockDisplay(mdpy);
         }
+    }
 };
 
 static bool errorTriggered;