From f88e1995b15c7dbeae1afb44e16c9ab2f20f25b9 Mon Sep 17 00:00:00 2001
From: "Aaron J. Seigo" <aseigo@kde.org>
Date: Thu, 2 Jul 2009 22:33:13 +0000
Subject: [PATCH] backport possible fix for 198338 CCBUG:198338

svn path=/branches/KDE/4.3/kdelibs/; revision=990659
---
 animator.cpp | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/animator.cpp b/animator.cpp
index 573dbe2e6..9dbae0953 100644
--- a/animator.cpp
+++ b/animator.cpp
@@ -622,6 +622,10 @@ void Animator::timerEvent(QTimerEvent *event)
     //kDebug() << "timeEvent, elapsed time: " << elapsed;
 
     foreach (AnimationState *state, d->animatedItems) {
+        if (d->animatedItemsToDelete.contains(state)) {
+            continue;
+        }
+
         if (state->currentInterval <= elapsed) {
             // we need to step forward!
             state->currentFrame +=
@@ -648,6 +652,10 @@ void Animator::timerEvent(QTimerEvent *event)
     }
 
     foreach (MovementState *state, d->movingItems) {
+        if (d->movingItemsToDelete.contains(state)) {
+            continue;
+        }
+
         if (state->currentInterval <= elapsed) {
             // we need to step forward!
             state->currentFrame +=
@@ -675,6 +683,10 @@ void Animator::timerEvent(QTimerEvent *event)
     }
 
     foreach (ElementAnimationState *state, d->animatedElements) {
+        if (d->animatedElementsToDelete.contains(state)) {
+            continue;
+        }
+
         if (state->currentFrame == state->frames) {
             //kDebug() << "skipping" << state->id << "as it is already at frame"
             //         << state->currentFrame << "of" << state->frames;
@@ -711,6 +723,10 @@ void Animator::timerEvent(QTimerEvent *event)
     }
 
     foreach (CustomAnimationState *state, d->customAnims) {
+        if (d->customAnimsToDelete.contains(state)) {
+            continue;
+        }
+
         if (state->currentInterval <= elapsed) {
             // advance the frame
             state->currentFrame +=