diff options
author | Tarja Sundqvist <[email protected]> | 2025-06-03 13:43:35 +0300 |
---|---|---|
committer | Tarja Sundqvist <[email protected]> | 2025-06-03 13:43:35 +0300 |
commit | 0f0972d542d9869c2dcfaf9c963d42ff32766460 (patch) | |
tree | f283360ffbf0453e04a321e01f0c3df1c07df3e3 /src/qml/animations | |
parent | 07e23b0f4983631524716f034c0268fd11d037f9 (diff) | |
parent | ff0a47c8f267e905113b82c53af2742027f0eca6 (diff) |
Merge tag 'v6.5.6-lts-lgpl' into 6.56.5
Qt 6.5.6-lts-lgpl release
Diffstat (limited to 'src/qml/animations')
-rw-r--r-- | src/qml/animations/qabstractanimationjob.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/qml/animations/qabstractanimationjob.cpp b/src/qml/animations/qabstractanimationjob.cpp index 7bb2af476c..a50685ba50 100644 --- a/src/qml/animations/qabstractanimationjob.cpp +++ b/src/qml/animations/qabstractanimationjob.cpp @@ -37,6 +37,9 @@ void QQmlAnimationTimer::unsetJobTimer(QAbstractAnimationJob *animation) if (animation->m_timer == this) animation->m_timer = nullptr; + if (animation->m_isPause) + runningPauseAnimations.removeOne(animation); + if (animation->isGroup()) { QAnimationGroupJob *group = static_cast<QAnimationGroupJob *>(animation); if (const auto children = group->children()) { @@ -214,10 +217,9 @@ void QQmlAnimationTimer::unregisterRunningAnimation(QAbstractAnimationJob *anima if (animation->m_isGroup) return; - if (animation->m_isPause) - runningPauseAnimations.removeOne(animation); - else + if (!animation->m_isPause) runningLeafAnimations--; + Q_ASSERT(runningLeafAnimations >= 0); } |