feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner.nodeInstances: add sanity check

Browse Source
This commit is contained in:
Thomas Hartmann
2010-03-22 11:33:44 +01:00
parent 6579d1d8c3
commit bad0da82d4
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/qmldesigner/core/model/qmlmodelview.cpp
View File

@@ -300,9 +300,10 @@ void QmlModelView::activateState(const QmlModelState &state)
QmlModelState oldState = m_state; QmlModelState oldState = m_state;
NodeInstance newStateInstance = instanceForModelNode(state.modelNode()); NodeInstance newStateInstance = instanceForModelNode(state.modelNode());
NodeInstance oldStateInstance = instanceForModelNode(oldState.modelNode()); NodeInstance oldStateInstance = oldState.isValid() ? instanceForModelNode(oldState.modelNode()) : NodeInstance();
if (state.isBaseState()) { if (state.isBaseState()) {
oldStateInstance.deactivateState(); if (oldStateInstance.isValid())
oldStateInstance.deactivateState();
} else { } else {
newStateInstance.activateState(); newStateInstance.activateState();
} }