Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #69 from sletta/mer-stable
Make sure we stop animators if they are yet to be started.
  • Loading branch information
sletta committed Apr 29, 2015
2 parents 27dc5c4 + 2638b41 commit c9bae19
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions src/quick/util/qquickanimatorjob.cpp
Expand Up @@ -131,9 +131,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);
}
}
Expand Down

0 comments on commit c9bae19

Please sign in to comment.