From 4969837ad6891c31753223199169c8390fa1ed93 Mon Sep 17 00:00:00 2001
From: Tim Jenssen <tim.jenssen@qt.io>
Date: Tue, 14 Nov 2017 20:59:05 +0100
Subject: [PATCH] QmlDesigner: fix crash while adding a delegate

Change-Id: I5944332dcc741cb67be55062c5d24e293973f090
Task-number: QTCREATORBUG-19190
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
---
 .../qmldesigner/designercore/model/modelnode.cpp    | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/plugins/qmldesigner/designercore/model/modelnode.cpp b/src/plugins/qmldesigner/designercore/model/modelnode.cpp
index 6f7ed9bbe78..641849d004a 100644
--- a/src/plugins/qmldesigner/designercore/model/modelnode.cpp
+++ b/src/plugins/qmldesigner/designercore/model/modelnode.cpp
@@ -1118,14 +1118,15 @@ bool ModelNode::isComponent() const
 
     if (metaInfo().isView() && hasNodeProperty("delegate")) {
         const ModelNode delegateNode = nodeProperty("delegate").modelNode();
-        if (delegateNode.hasMetaInfo()) {
-            const NodeMetaInfo delegateMetaInfo = delegateNode.metaInfo();
-            if (delegateMetaInfo.isValid() && delegateMetaInfo.isFileComponent())
+        if (delegateNode.isValid()) {
+            if (delegateNode.hasMetaInfo()) {
+                const NodeMetaInfo delegateMetaInfo = delegateNode.metaInfo();
+                if (delegateMetaInfo.isValid() && delegateMetaInfo.isFileComponent())
+                    return true;
+            }
+            if (delegateNode.nodeSourceType() == ModelNode::NodeWithComponentSource)
                 return true;
         }
-
-        if (delegateNode.nodeSourceType() == ModelNode::NodeWithComponentSource)
-            return true;
     }
 
     if (metaInfo().isSubclassOf("QtQuick.Loader")) {