Fix crash when animators are deleted just after being started.

Change-Id: I35850e279dae596edb9a1b93143d6aa195221b41
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>

diff --git a/src/quick/util/qquickanimatorjob.cpp b/src/quick/util/qquickanimatorjob.cpp
index 0bf95a4..9f81f28 100644 (file)
--- a/src/quick/util/qquickanimatorjob.cpp
+++ b/src/quick/util/qquickanimatorjob.cpp
@@ -97,9 +97,11 @@ QQuickAnimatorProxyJob::~QQuickAnimatorProxyJob()
 void QQuickAnimatorProxyJob::deleteJob()
 {
     if (m_job) {
-        if (m_controller && m_internalState != State_Starting)
+        // If we have a controller, we might have posted the job to be started
+        // so delete it through the controller to clean up properly.
+        if (m_controller)
             m_controller->deleteJob(m_job);
-        else if (m_internalState == State_Starting)
+        else
             delete m_job;
         m_job = 0;
     }