summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Hartmann <Thomas.Hartmann@nokia.com>2011-04-29 10:10:23 +0200
committercon <qtc-committer@nokia.com>2011-04-29 10:18:45 +0200
commit8c74bc10d490f361ecef1e721e6d9b1bdcf4a7c7 (patch)
tree5f519d828056a465df1b3150cfd455012c5a3908
parent43a10b9d1a2959088d0abff3942e1317bf7ec329 (diff)
downloadqt-creator-8c74bc10d490f361ecef1e721e6d9b1bdcf4a7c7.tar.gz
QmlDesigner.statesEditor: crash fix
If the current state is deleted we have to go to the base state to stay in a valid state. Task-Nr: QTCREATORBUG-4339 Reviewed-by: Kai Koehne
-rw-r--r--src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp b/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
index 345ef1227b..96fc80810d 100644
--- a/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
+++ b/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
@@ -264,6 +264,8 @@ void StatesEditorView::nodeAboutToBeRemoved(const ModelNode &removedNode)
m_lastIndex = propertyParent.indexOf(removedNode);
}
}
+ if (removedNode == currentState())
+ setCurrentState(baseState());
}
void StatesEditorView::nodeRemoved(const ModelNode & /*removedNode*/, const NodeAbstractProperty &parentProperty, PropertyChangeFlags /*propertyChange*/)