aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/qquickanimatedsprite_p.h
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2012-06-13 18:49:12 +1000
committerQt by Nokia <qt-info@nokia.com>2012-06-20 06:04:01 +0200
commit369423f7410dfa855b96c559603e4c75a3a22256 (patch)
tree2d927748cab2d62b50c77c017d6816f23b1ce0ae /src/quick/items/qquickanimatedsprite_p.h
parentcbc6c299d48b05500c8f496abed5ef8b8f735add (diff)
Don't start running if a frame property is set
This fixes an error where running couldn't be reliably set, if a frame property was also being set during initialization. With this fixed, the autotest is no longer unstable. Also fixed is a related issue where start/stop/restart were active before componentComplete. Change-Id: I34c6d872f2f146d38c65167eda8c0a97525d7f4e Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
Diffstat (limited to 'src/quick/items/qquickanimatedsprite_p.h')
-rw-r--r--src/quick/items/qquickanimatedsprite_p.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/quick/items/qquickanimatedsprite_p.h b/src/quick/items/qquickanimatedsprite_p.h
index 4d9c008c36..0e5ccc2244 100644
--- a/src/quick/items/qquickanimatedsprite_p.h
+++ b/src/quick/items/qquickanimatedsprite_p.h
@@ -250,7 +250,8 @@ public slots:
if (m_sprite->m_frameSync != arg) {
m_sprite->setFrameSync(arg);
emit frameSyncChanged(arg);
- restart();
+ if (m_running)
+ restart();
}
}
@@ -304,7 +305,8 @@ public slots:
if (m_sprite->m_frameRate != arg) {
m_sprite->setFrameRate(arg);
emit frameRateChanged(arg);
- restart();
+ if (m_running)
+ restart();
}
}
@@ -313,7 +315,8 @@ public slots:
if (m_sprite->m_frameDuration != arg) {
m_sprite->setFrameDuration(arg);
emit frameDurationChanged(arg);
- restart();
+ if (m_running)
+ restart();
}
}