From: Kim Motoyoshi Kalland <kim.kalland@nokia.com>
Date: Tue, 15 Nov 2011 16:20:46 +0000 (+0100)
Subject: Avoid calling maybeUpdate() during ShaderEffectSource cleanup.
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=c560a38ac95e3febb1d39598a5c4de43c495b67c;p=konrad%2Fqtdeclarative.git

Avoid calling maybeUpdate() during ShaderEffectSource cleanup.

markDirtyTexture() causes sceneGraphChanged() to be emitted from
the renderer containing the ShaderEffectSource, which in turn
causes QQuickCanvasRenderThread::maybeUpdate() to be called.

Change-Id: I3c068e41501ed4cb2c5f4ff705ffd478743b4beb
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
---

diff --git a/src/declarative/items/qquickshadereffectsource.cpp b/src/declarative/items/qquickshadereffectsource.cpp
index 252c0ba..92e2072 100644
--- a/src/declarative/items/qquickshadereffectsource.cpp
+++ b/src/declarative/items/qquickshadereffectsource.cpp
@@ -116,6 +116,8 @@ QQuickShaderEffectTexture::QQuickShaderEffectTexture(QQuickItem *shaderSource)
 
 QQuickShaderEffectTexture::~QQuickShaderEffectTexture()
 {
+    if (m_renderer)
+        disconnect(m_renderer, SIGNAL(sceneGraphChanged()), this, SLOT(markDirtyTexture()));
     delete m_renderer;
     delete m_fbo;
     delete m_secondaryFbo;