vcl/source/opengl/OpenGLContext.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
New commits: commit a2731f219fd5b7b86efb9519a3680c93d7bb4029 Author: Markus Mohrhard <[email protected]> Date: Mon Sep 7 16:39:04 2015 +0200 tdf#93989 - prevent crash with non-vcl OpenGL contexts Change-Id: Ia829b0f723c8ded1237e52d48f034da3c1ac249e Signed-off-by: Michael Meeks <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/18409 Reviewed-by: Jan Holesovsky <[email protected]> Reviewed-by: Miklos Vajna <[email protected]> Tested-by: Miklos Vajna <[email protected]> diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx index e217690..978fdd7f 100644 --- a/vcl/source/opengl/OpenGLContext.cxx +++ b/vcl/source/opengl/OpenGLContext.cxx @@ -1505,7 +1505,8 @@ void OpenGLContext::resetCurrent() #elif defined( IOS ) || defined( ANDROID ) || defined(LIBO_HEADLESS) // nothing #elif defined( UNX ) - glXMakeCurrent(m_aGLWin.dpy, None, NULL); + if (m_aGLWin.dpy) + glXMakeCurrent(m_aGLWin.dpy, None, NULL); #endif } _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
