From 57d3af6d891ea28a041a4f97de33e7624b172b22 Mon Sep 17 00:00:00 2001
From: Henning Gruendl <henning.gruendl@qt.io>
Date: Tue, 15 Nov 2022 17:03:42 +0100
Subject: [PATCH] QmlDesigner: Fix state group selection

The issue was caused by a mistake during branch merging.

Task-number: QDS-8244
Task-number: QDS-8245
Change-Id: Ib88f0c5201229295c0cec45d806917156bd86d9f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
---
 .../components/stateseditornew/stateseditorview.cpp        | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/plugins/qmldesigner/components/stateseditornew/stateseditorview.cpp b/src/plugins/qmldesigner/components/stateseditornew/stateseditorview.cpp
index de7fc2be5f7..e005d6243db 100644
--- a/src/plugins/qmldesigner/components/stateseditornew/stateseditorview.cpp
+++ b/src/plugins/qmldesigner/components/stateseditornew/stateseditorview.cpp
@@ -111,7 +111,9 @@ void StatesEditorView::setActiveStatesGroupNode(const ModelNode &modelNode)
 
 int StatesEditorView::activeStatesGroupIndex() const
 {
-    return 1;
+    if (!model())
+        return -1;
+
     return Utils::indexOf(allModelNodesOfType(model()->qtQuickStateGroupMetaInfo()),
                           [this](const ModelNode &node) { return node == m_activeStatesGroupNode; })
            + 1;
@@ -119,6 +121,9 @@ int StatesEditorView::activeStatesGroupIndex() const
 
 void StatesEditorView::setActiveStatesGroupIndex(int index)
 {
+    if (!model())
+        return;
+
     if (index > 0) {
         const ModelNode statesGroup = allModelNodesOfType(model()->qtQuickStateGroupMetaInfo())
                                           .at(index - 1);