1 files changed, 7 insertions, 2 deletions
diff --git a/src/quick/util/qquickanimatorcontroller.cpp b/src/quick/util/qquickanimatorcontroller.cpp
index c875e18978..74930fb373 100644
--- a/src/quick/util/qquickanimatorcontroller.cpp
+++ b/src/quick/util/qquickanimatorcontroller.cpp
@@ -140,6 +140,11 @@ static void qquick_initialize_helper(QAbstractAnimationJob *job, QQuickAnimatorC
 {
     if (job->isRenderThreadJob()) {
         QQuickAnimatorJob *j = static_cast<QQuickAnimatorJob *>(job);
+        // Note: since a QQuickAnimatorJob::m_target is a QPointer,
+        // if m_target is destroyed between the time it was set
+        // as the target of the animator job and before this step,
+        // (e.g a Loader being set inactive just after starting the animator)
+        // we are sure it will be NULL and won't be dangling around
         if (!j->target()) {
             return;
         } else if (c->m_deletedSinceLastFrame.contains(j->target())) {
@@ -217,8 +222,8 @@ void QQuickAnimatorController::beforeNodeSync()
 void QQuickAnimatorController::afterNodeSync()
 {
     foreach (QQuickAnimatorJob *job, m_activeLeafAnimations) {
-        if (job->isUniform() && job->target())
-            static_cast<QQuickUniformAnimatorJob *>(job)->afterNodeSync();
+        if (job->target())
+            job->afterNodeSync();
     }
 }