aboutsummaryrefslogtreecommitdiffstats
path: root/src/declarative/items/qsgshadereffectsource.cpp
diff options
context:
space:
mode:
authorKim Motoyoshi Kalland <kim.kalland@nokia.com>2011-05-18 17:49:06 +0200
committerKim Motoyoshi Kalland <kim.kalland@nokia.com>2011-05-18 17:49:06 +0200
commitacbc84876a39380982848036ff0f9eaadd6a0593 (patch)
tree585c734247f1544efafb36e9c536c5492ef5d73b /src/declarative/items/qsgshadereffectsource.cpp
parent7ef7dd68dc66226b01ea49a081a8c106ca545cea (diff)
Fixed crash when Image/ShaderEffectSource source is missing.
Diffstat (limited to 'src/declarative/items/qsgshadereffectsource.cpp')
-rw-r--r--src/declarative/items/qsgshadereffectsource.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/declarative/items/qsgshadereffectsource.cpp b/src/declarative/items/qsgshadereffectsource.cpp
index 199a56067e..217b0e67a7 100644
--- a/src/declarative/items/qsgshadereffectsource.cpp
+++ b/src/declarative/items/qsgshadereffectsource.cpp
@@ -206,7 +206,13 @@ void QSGShaderEffectTexture::markDirtyTexture()
void QSGShaderEffectTexture::grab()
{
- Q_ASSERT(m_item);
+ if (!m_item || m_size.isNull()) {
+ delete m_fbo;
+ delete m_secondaryFbo;
+ m_fbo = m_secondaryFbo = 0;
+ m_dirtyTexture = false;
+ return;
+ }
QSGNode *root = m_item;
while (root->childCount() && root->type() != QSGNode::RootNodeType)
root = root->childAtIndex(0);