diff options
| author | Gunnar Sletta <gunnar.sletta@jollamobile.com> | 2015-04-08 09:27:44 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-04-15 14:00:19 +0000 |
| commit | 327ddb7488805241fb48c20ec8628c630224f4ce (patch) | |
| tree | 7aea8c55dcb65b6433edd47c6d8a6499b2fe301b /src/quick/util/qquickanimatorjob.cpp | |
| parent | 383465e908c880c00546dc182424b5de17b63de6 (diff) | |
Make sure we stop animators if they are yet to be started.
Change-Id: I311e66c64a79581739f80e124fd58da2aaded549
Task-number: QTBUG-45220
Reviewed-by: Michael Brasser <michael.brasser@live.com>
Diffstat (limited to 'src/quick/util/qquickanimatorjob.cpp')
| -rw-r--r-- | src/quick/util/qquickanimatorjob.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/quick/util/qquickanimatorjob.cpp b/src/quick/util/qquickanimatorjob.cpp index 8b617e5e3f..016f41d436 100644 --- a/src/quick/util/qquickanimatorjob.cpp +++ b/src/quick/util/qquickanimatorjob.cpp @@ -126,9 +126,8 @@ void QQuickAnimatorProxyJob::updateState(QAbstractAnimationJob::State newState, m_controller->startJob(this, m_job); } else if (newState == Stopped) { syncBackCurrentValues(); - if (m_internalState == State_Starting) - m_internalState = State_Stopped; - else if (m_controller) { + m_internalState = State_Stopped; + if (m_controller) { m_controller->stopJob(this, m_job); } } |