From c250642e4445d604f3afa968c7d07708879f1c80 Mon Sep 17 00:00:00 2001 From: "Aaron J. Seigo" Date: Tue, 9 Jun 2009 03:39:37 +0000 Subject: [PATCH] always remove the item we're going to delete from the main collection, however svn path=/trunk/KDE/kdelibs/; revision=979140 --- animator.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/animator.cpp b/animator.cpp index 3bbcac3ea..ecb2412db 100644 --- a/animator.cpp +++ b/animator.cpp @@ -358,8 +358,9 @@ int Animator::moveItem(QGraphicsItem *item, Movement movement, const QPoint &des d->movingItemsToDelete.append(it.value()); } else { delete it.value(); - d->movingItems.erase(it); } + + d->movingItems.erase(it); } int frames = d->driver->movementAnimationFps(movement); @@ -468,9 +469,9 @@ void Animator::stopItemAnimation(int id) d->animatedItemsToDelete.append(it.value()); } else { delete it.value(); - it.remove(); } + it.remove(); return; } } @@ -486,9 +487,9 @@ void Animator::stopItemMovement(int id) d->movingItemsToDelete.append(it.value()); } else { delete it.value(); - it.remove(); } + it.remove(); return; } }