From 4d58f8dee8ff82fe6134f6b9a0a8a6dd597b778d Mon Sep 17 00:00:00 2001
From: Knud Dollereder <knud.dollereder@qt.io>
Date: Fri, 6 May 2022 14:28:20 +0200
Subject: Make the curveeditor state aware

Fixes: QDS-6872
Change-Id: I2fe733bf6c25d3517ff80d122977113e10bac627
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
---
 .../qmldesigner/components/curveeditor/curveeditorview.cpp        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/plugins/qmldesigner/components/curveeditor/curveeditorview.cpp b/src/plugins/qmldesigner/components/curveeditor/curveeditorview.cpp
index c449d0e864..eee4b69db6 100644
--- a/src/plugins/qmldesigner/components/curveeditor/curveeditorview.cpp
+++ b/src/plugins/qmldesigner/components/curveeditor/curveeditorview.cpp
@@ -215,10 +215,9 @@ QmlTimeline CurveEditorView::activeTimeline() const
                 if (node.hasVariantProperty("enabled")
                     && node.variantProperty("enabled").value().toBool())
                     return QmlTimeline(node);
-
-                return {};
             }
         }
+        return {};
     }
 
     for (const ModelNode &node : allModelNodesOfType("QtQuick.Timeline.Timeline")) {
@@ -227,8 +226,9 @@ QmlTimeline CurveEditorView::activeTimeline() const
             if (!propertyChanges.isValid())
                 continue;
 
-            if (node.hasVariantProperty("enabled") && node.variantProperty("enabled").value().toBool())
-                return QmlTimeline(node);
+            if (propertyChanges.modelNode().hasProperty("enabled") &&
+                propertyChanges.modelNode().variantProperty("enabled").value().toBool())
+                    return QmlTimeline(node);
         }
     }
     return {};
-- 
cgit v1.2.3