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 (file)
--- 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;