QmlDesigner: Fix potential null dereference

Change-Id: I291d07548bbbe7c7ab75dc55004e3c44c4bf0020
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp
index ba180fbac4..0cf7b5016f 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp
@@ -243,6 +243,11 @@ void PropertyEditorView::changeExpression(const QString &propertyName)
         QmlObjectNode qmlObjectNode(m_selectedNode);
         PropertyEditorValue *value = m_qmlBackEndForCurrentType->propertyValueForName(underscoreName);
 
+        if (!value) {
+            qWarning() << "PropertyEditor::changeExpression no value for " << underscoreName;
+            return;
+        }
+
         if (qmlObjectNode.modelNode().metaInfo().isValid() && qmlObjectNode.modelNode().metaInfo().hasProperty(name)) {
             if (qmlObjectNode.modelNode().metaInfo().propertyTypeName(name) == "QColor") {
                 if (QColor(value->expression().remove('"')).isValid()) {
@@ -278,11 +283,6 @@ void PropertyEditorView::changeExpression(const QString &propertyName)
             }
         }
 
-        if (!value) {
-            qWarning() << "PropertyEditor::changeExpression no value for " << underscoreName;
-            return;
-        }
-
         if (value->expression().isEmpty())
             return;