Kaydet (Commit) 2fd94938 authored tarafından Markus Mohrhard's avatar Markus Mohrhard Kaydeden (comit) Michael Stahl

don't use a null display

Change-Id: Iab0a53abd723f0309f40742636315079a4b2c532
(cherry picked from commit c94d60d6)
Signed-off-by: 's avatarMichael Stahl <mstahl@redhat.com>
üst 61b7d343
...@@ -465,18 +465,24 @@ public: ...@@ -465,18 +465,24 @@ public:
TempErrorHandler(Display* dpy, errorHandler newErrorHandler): TempErrorHandler(Display* dpy, errorHandler newErrorHandler):
mdpy(dpy) mdpy(dpy)
{ {
XLockDisplay(dpy); if (mdpy)
XSync(dpy, false); {
oldErrorHandler = XSetErrorHandler(newErrorHandler); XLockDisplay(dpy);
XSync(dpy, false);
oldErrorHandler = XSetErrorHandler(newErrorHandler);
}
} }
~TempErrorHandler() ~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);
}
} }
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment