From 0822065ed2103da47ec1e78f645ca43c933f176f Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <thomas.hartmann@qt.io>
Date: Wed, 8 Mar 2017 17:13:47 +0100
Subject: [PATCH] QmlDesigner: Fix crash

Change-Id: I3cee292d9567877fb159985dbf837f61ecb83baa
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
---
 .../components/propertyeditor/propertyeditorvalue.cpp     | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp
index 66d890bb92b..909adf82fc5 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp
@@ -299,9 +299,11 @@ void PropertyEditorValue::exportPopertyAsAlias()
 
 bool PropertyEditorValue::hasPropertyAlias() const
 {
-    if (modelNode().isValid())
-        if (modelNode().isRootNode())
-            return false;
+    if (!modelNode().isValid())
+        return false;
+
+    if (modelNode().isRootNode())
+        return false;
 
     if (!modelNode().hasId())
         return false;