always remove the item we're going to delete from the main collection, however
svn path=/trunk/KDE/kdelibs/; revision=979140
This commit is contained in:
parent
74a6212595
commit
c250642e44
@ -358,8 +358,9 @@ int Animator::moveItem(QGraphicsItem *item, Movement movement, const QPoint &des
|
|||||||
d->movingItemsToDelete.append(it.value());
|
d->movingItemsToDelete.append(it.value());
|
||||||
} else {
|
} else {
|
||||||
delete it.value();
|
delete it.value();
|
||||||
d->movingItems.erase(it);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
d->movingItems.erase(it);
|
||||||
}
|
}
|
||||||
|
|
||||||
int frames = d->driver->movementAnimationFps(movement);
|
int frames = d->driver->movementAnimationFps(movement);
|
||||||
@ -468,9 +469,9 @@ void Animator::stopItemAnimation(int id)
|
|||||||
d->animatedItemsToDelete.append(it.value());
|
d->animatedItemsToDelete.append(it.value());
|
||||||
} else {
|
} else {
|
||||||
delete it.value();
|
delete it.value();
|
||||||
it.remove();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
it.remove();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -486,9 +487,9 @@ void Animator::stopItemMovement(int id)
|
|||||||
d->movingItemsToDelete.append(it.value());
|
d->movingItemsToDelete.append(it.value());
|
||||||
} else {
|
} else {
|
||||||
delete it.value();
|
delete it.value();
|
||||||
it.remove();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
it.remove();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user