From 7ee1d89a656c05b62fa3104b59504afed0037b69 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 25 Jun 2015 22:31:50 +0300 Subject: Add missing checks into db directory. --- src/utils/glxhelper.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/utils/glxhelper.cpp') diff --git a/src/utils/glxhelper.cpp b/src/utils/glxhelper.cpp index 40f2b6f9f..42ac8ccb5 100644 --- a/src/utils/glxhelper.cpp +++ b/src/utils/glxhelper.cpp @@ -48,6 +48,8 @@ void *GlxHelper::createContext(const unsigned long window, XSync(display, false); int (*handler)(Display *, XErrorEvent *) = XSetErrorHandler(ErrorHandler); void *context = mglXGetCurrentContext(); + if (!display) + return context; if (isGLNull(mglXGetCurrentContext) || isGLNull(mglXCreateContextAttribs) || isGLNull(mglXChooseFBConfig)) @@ -124,6 +126,8 @@ bool GlxHelper::makeCurrent(const unsigned long window, void *const display, void *const context) { + if (!display) + return false; return mglXMakeCurrent(static_cast(display), window, context); } -- cgit v1.2.3-60-g2f50