From bf69c6c3a94ab0c2747039dcb6c517390ccbcc6f Mon Sep 17 00:00:00 2001
From: Knud Dollereder <knud.dollereder@qt.io>
Date: Wed, 25 May 2022 15:38:17 +0200
Subject: [PATCH] Do not update animation range from inactive timelines

In a scene with multiple states and timelines it occasionally happend
that the curve editor was updated from an inactive timeline.
This is now fixed.

Fixes: QDS-6948
Change-Id: I586593452e69cebe7bb2571e301230bf0ace8631
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
---
 .../curveeditor/curveeditorview.cpp           | 25 ++++++++++++-------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/plugins/qmldesigner/components/curveeditor/curveeditorview.cpp b/src/plugins/qmldesigner/components/curveeditor/curveeditorview.cpp
index eee4b69db65..7421d7b6658 100644
--- a/src/plugins/qmldesigner/components/curveeditor/curveeditorview.cpp
+++ b/src/plugins/qmldesigner/components/curveeditor/curveeditorview.cpp
@@ -149,16 +149,23 @@ void CurveEditorView::instancePropertyChanged(const QList<QPair<ModelNode, Prope
 {
     Q_UNUSED(propertyList);
 
-    for (const auto &pair : propertyList) {
-        if (!QmlTimeline::isValidQmlTimeline(pair.first))
-            continue;
+    if (auto timeline = activeTimeline(); timeline.isValid()) {
 
-        if (pair.second == "startFrame")
-            updateStartFrame(pair.first);
-        else if (pair.second == "endFrame")
-            updateEndFrame(pair.first);
-        else if (pair.second == "currentFrame")
-            updateCurrentFrame(pair.first);
+        auto timelineNode = timeline.modelNode();
+        for (const auto &pair : propertyList) {
+            if (!QmlTimeline::isValidQmlTimeline(pair.first))
+                continue;
+
+            if (pair.first != timelineNode)
+                continue;
+
+            if (pair.second == "startFrame")
+                updateStartFrame(pair.first);
+            else if (pair.second == "endFrame")
+                updateEndFrame(pair.first);
+            else if (pair.second == "currentFrame")
+                updateCurrentFrame(pair.first);
+        }
     }
 }