diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-09-07 16:39:04 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-09-08 14:02:05 +0000 |
| commit | a2731f219fd5b7b86efb9519a3680c93d7bb4029 (patch) | |
| tree | dc6479dae9a815d90c86a407f3d5da0decc1c210 | |
| parent | e489429b66b74ddffbd121b34faecb75fb2b24e4 (diff) | |
tdf#93989 - prevent crash with non-vcl OpenGL contexts
Change-Id: Ia829b0f723c8ded1237e52d48f034da3c1ac249e
Signed-off-by: Michael Meeks <michael.meeks@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/18409
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
| -rw-r--r-- | vcl/source/opengl/OpenGLContext.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx index e2176905f46a..978fdd7f28c1 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 } |