Kaydet (Commit) c94d60d6 authored tarafından Markus Mohrhard's avatar Markus Mohrhard

don't use a null display

Change-Id: Iab0a53abd723f0309f40742636315079a4b2c532
üst 9a5bd1cc
...@@ -491,13 +491,18 @@ private: ...@@ -491,13 +491,18 @@ private:
public: public:
TempErrorHandler(Display* dpy, errorHandler newErrorHandler): TempErrorHandler(Display* dpy, errorHandler newErrorHandler):
mdpy(dpy) mdpy(dpy)
{
if (mdpy)
{ {
XLockDisplay(dpy); XLockDisplay(dpy);
XSync(dpy, false); XSync(dpy, false);
oldErrorHandler = XSetErrorHandler(newErrorHandler); oldErrorHandler = XSetErrorHandler(newErrorHandler);
} }
}
~TempErrorHandler() ~TempErrorHandler()
{
if (mdpy)
{ {
// sync so that we possibly get an XError // sync so that we possibly get an XError
glXWaitGL(); glXWaitGL();
...@@ -505,6 +510,7 @@ public: ...@@ -505,6 +510,7 @@ public:
XSetErrorHandler(oldErrorHandler); XSetErrorHandler(oldErrorHandler);
XUnlockDisplay(mdpy); XUnlockDisplay(mdpy);
} }
}
}; };
static bool errorTriggered; static bool errorTriggered;
......
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