diff options
| author | Berthold Krevert <berthold.krevert@basyskom.com> | 2012-08-03 16:56:53 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-06 11:19:20 +0200 |
| commit | 7968bd306d182d244a73682aebdb9e74edbc6304 (patch) | |
| tree | b0ce09131a75ca0505dc50234aa6484b73ef39b8 /src/particles | |
| parent | 35c8ad7957aed842e1aba60df96e50c5e2dcf133 (diff) | |
Fixes a crash in QQuickImageParticle
Fixes this bug: If the property source is set to an empty string or not set at all, the application crashes due to a missing pointer check.
Change-Id: I8c2a2ba738ceda573e655221fde37012f6bf3053
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Diffstat (limited to 'src/particles')
| -rw-r--r-- | src/particles/qquickimageparticle.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/particles/qquickimageparticle.cpp b/src/particles/qquickimageparticle.cpp index b55589e3eb..128bdf235f 100644 --- a/src/particles/qquickimageparticle.cpp +++ b/src/particles/qquickimageparticle.cpp @@ -855,6 +855,7 @@ void QQuickImageParticle::setImage(const QUrl &image) if (image.isEmpty()){ if (m_image) { delete m_image; + m_image = 0; emit imageChanged(); } return; @@ -1431,8 +1432,9 @@ void QQuickImageParticle::finishBuildParticleNodes() if (!m_material) m_material = SimpleMaterial::createMaterial(); if (!imageLoaded) { - if (!m_image->pix.isReady()) { - qmlInfo(this) << m_image->pix.error(); + if (!m_image || !m_image->pix.isReady()) { + if (m_image) + qmlInfo(this) << m_image->pix.error(); delete m_material; return; } |