From bad0da82d4ce6031188eb396d30ab08bff5c0f04 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Date: Mon, 22 Mar 2010 11:33:44 +0100
Subject: [PATCH] QmlDesigner.nodeInstances: add sanity check

---
 src/plugins/qmldesigner/core/model/qmlmodelview.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/plugins/qmldesigner/core/model/qmlmodelview.cpp b/src/plugins/qmldesigner/core/model/qmlmodelview.cpp
index 708fe73da11..198109c9fa4 100644
--- a/src/plugins/qmldesigner/core/model/qmlmodelview.cpp
+++ b/src/plugins/qmldesigner/core/model/qmlmodelview.cpp
@@ -300,9 +300,10 @@ void QmlModelView::activateState(const QmlModelState &state)
     QmlModelState oldState = m_state;
 
     NodeInstance newStateInstance = instanceForModelNode(state.modelNode());
-    NodeInstance oldStateInstance = instanceForModelNode(oldState.modelNode());
+    NodeInstance oldStateInstance = oldState.isValid() ? instanceForModelNode(oldState.modelNode()) : NodeInstance();
     if (state.isBaseState()) {
-        oldStateInstance.deactivateState();
+        if (oldStateInstance.isValid())
+            oldStateInstance.deactivateState();
     } else {
         newStateInstance.activateState();
     }