Prevent an animation from being registered to run twice.

This could cause animations to start running that could not later be
stopped.

Change-Id: I320f50121f3566619f08181664d049b02e2848e5
Reviewed-by: Martin Jones

1 files changed, 14 insertions, 0 deletions

diff --git a/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp b/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp
index d1b7c1b0f9..f7fee3b679 100644
--- a/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp
+++ b/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp
@@ -86,6 +86,7 @@ private slots:
     void runningTrueBug();
     void nonTransitionBug();
     void registrationBug();
+    void doubleRegistrationBug();
 };
 
 #define QTIMED_COMPARE(lhs, rhs) do { \
@@ -805,6 +806,19 @@ void tst_qdeclarativeanimations::registrationBug()
     QTRY_COMPARE(rect->property("value"), QVariant(int(100)));
 }
 
+void tst_qdeclarativeanimations::doubleRegistrationBug()
+{
+    QDeclarativeEngine engine;
+
+    QDeclarativeComponent c(&engine, SRCDIR "/data/doubleRegistrationBug.qml");
+    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
+    QVERIFY(rect != 0);
+
+    QDeclarativeAbstractAnimation *anim = rect->findChild<QDeclarativeAbstractAnimation*>("animation");
+    QVERIFY(anim != 0);
+    QTRY_COMPARE(anim->qtAnimation()->state(), QAbstractAnimation::Stopped);
+}
+
 QTEST_MAIN(tst_qdeclarativeanimations)
 
 #include "tst_qdeclarativeanimations.moc"