From 33957a2fee921742769e89ce6af348d182d183b2 Mon Sep 17 00:00:00 2001
From: Tom Cooksey <thomas.cooksey@nokia.com>
Date: Thu, 16 Apr 2009 17:57:00 +0200
Subject: Don't seg-fault when the shader prog is in the cache

---
 src/opengl/gl2paintengineex/qglengineshadermanager.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/opengl/gl2paintengineex/qglengineshadermanager.cpp b/src/opengl/gl2paintengineex/qglengineshadermanager.cpp
index ea01604..1253414 100644
--- a/src/opengl/gl2paintengineex/qglengineshadermanager.cpp
+++ b/src/opengl/gl2paintengineex/qglengineshadermanager.cpp
@@ -211,6 +211,7 @@ QGLShaderProgram* QGLEngineShaderManager::simpleProgram()
 void QGLEngineShaderManager::useCorrectShaderProg()
 {
     QGLEngineShaderProg requiredProgram;
+    requiredProgram.program = 0;
 
     // Choose vertex shader main function
     QGLEngineShaderManager::ShaderName mainVertexShaderName = InvalidShaderName;
@@ -375,7 +376,7 @@ void QGLEngineShaderManager::useCorrectShaderProg()
              && (prog.srcPixelFragShader == requiredProgram.srcPixelFragShader)
              && (prog.compositionFragShader == requiredProgram.compositionFragShader) )
         {
-            currentShaderProg = requiredProgram.program;
+            currentShaderProg = prog.program;
             currentShaderProg->enable();
             shaderProgNeedsChanging = false;
             return;
-- 
cgit v0.12