From c560a38ac95e3febb1d39598a5c4de43c495b67c Mon Sep 17 00:00:00 2001 From: Kim Motoyoshi Kalland Date: Tue, 15 Nov 2011 17:20:46 +0100 Subject: [PATCH] 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 --- src/declarative/items/qquickshadereffectsource.cpp | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) 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; -- 1.7.2.5