vcl/source/opengl/OpenGLContext.cxx | 7 +++++++ 1 file changed, 7 insertions(+)
New commits: commit b7ffafe77d95c72402bdac0328ca3bfcb7444067 Author: Miklos Vajna <[email protected]> Date: Thu Sep 10 11:39:44 2015 +0200 windows opengl: mpCurrentProgram seen as 0 in JunitTest_sc_unoapi_3. Change-Id: Ibe12a31c1158f782bd7df115171b07e1843d025c (cherry picked from commit 57fc41adc9292f8980bb8bbbb0d7983310fe6fe3) Reviewed-on: https://gerrit.libreoffice.org/18489 Tested-by: Jenkins <[email protected]> Reviewed-by: Tomaž Vajngerl <[email protected]> diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx index d1df28b..ea9664e 100644 --- a/vcl/source/opengl/OpenGLContext.cxx +++ b/vcl/source/opengl/OpenGLContext.cxx @@ -1751,6 +1751,13 @@ OpenGLProgram* OpenGLContext::UseProgram( const OUString& rVertexShader, const O return pProgram; mpCurrentProgram = pProgram; + + if (!mpCurrentProgram) + { + SAL_WARN("vcl.opengl", "OpenGLContext::UseProgram: mpCurrentProgram is 0"); + return 0; + } + mpCurrentProgram->Use(); return mpCurrentProgram;
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
