QmlDesigner.nodeInstances: fixing isValid for NodeInstance

We have to check also for the ModelNode, but we also have to avoid
recursion.

Reviewed-by: Marco Bubke

1 files changed, 2 insertions, 2 deletions

diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
index d15272c124..18b6f78e59 100644
--- a/src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
+++ b/src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
@@ -82,7 +82,7 @@ NodeInstance &NodeInstance::operator=(const NodeInstance &other)
 
 ModelNode NodeInstance::modelNode() const
 {
-    if (isValid()) {
+    if (d) {
         return  d->modelNode;
     } else {
         return ModelNode();
@@ -100,7 +100,7 @@ qint32 NodeInstance::instanceId() const
 
 bool NodeInstance::isValid() const
 {
-    return instanceId() >= 0;
+    return instanceId() >= 0 && modelNode().isValid();
 }
 
 void NodeInstance::makeInvalid()