Fix crash in SpriteSequence

When QML declares sprites and goalSprite in wrong order the goalsprite
attempts to set it on null spriteEngine. This patch ensures that the
order doesn't matter anymore.

Task-number: QTBUG-40595
Change-Id: I57f1c8754b2e2af91e0c7f72d1d67fec3ad4ede5
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

1 files changed, 7 insertions, 3 deletions

diff --git a/src/quick/items/qquickspritesequence.cpp b/src/quick/items/qquickspritesequence.cpp
index 0be6486bf0..a9a823c2ce 100644
--- a/src/quick/items/qquickspritesequence.cpp
+++ b/src/quick/items/qquickspritesequence.cpp
@@ -243,7 +243,8 @@ void QQuickSpriteSequence::setGoalSprite(const QString &sprite)
     if (m_goalState != sprite){
         m_goalState = sprite;
         emit goalSpriteChanged(sprite);
-        m_spriteEngine->setGoal(m_spriteEngine->stateIndex(sprite));
+        if (m_spriteEngine)
+            m_spriteEngine->setGoal(m_spriteEngine->stateIndex(sprite));
     }
 }
 
@@ -257,10 +258,13 @@ void QQuickSpriteSequence::createEngine()
     //TODO: delay until component complete
     if (m_spriteEngine)
         delete m_spriteEngine;
-    if (m_sprites.count())
+    if (m_sprites.count()) {
         m_spriteEngine = new QQuickSpriteEngine(m_sprites, this);
-    else
+        if (!m_goalState.isEmpty())
+            m_spriteEngine->setGoal(m_spriteEngine->stateIndex(m_goalState));
+    } else {
         m_spriteEngine = 0;
+    }
     reset();
 }