From ca8daecdff63d8c1b639b4b60a235075cf1d814b Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@nokia.com>
Date: Wed, 13 Jul 2011 19:18:37 +0200
Subject: [PATCH] QmlDesigner: Fix crash for property editor detach
Change-Id: I367b45c9ae0e8f18abffceb996dbf13a14d8089a
Reviewed-on: http://codereview.qt.nokia.com/1610
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
---
src/plugins/qmldesigner/designercore/model/abstractview.cpp | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/plugins/qmldesigner/designercore/model/abstractview.cpp b/src/plugins/qmldesigner/designercore/model/abstractview.cpp
index 1c3cd7be182..3b287d32b4a 100644
--- a/src/plugins/qmldesigner/designercore/model/abstractview.cpp
+++ b/src/plugins/qmldesigner/designercore/model/abstractview.cpp
@@ -463,7 +463,10 @@ void AbstractView::changeRootNodeType(const QString &type, int majorVersion, int
ModelNode AbstractView::actualStateNode() const
{
- return ModelNode(m_model.data()->m_d->actualStateNode(), m_model.data(), const_cast<AbstractView*>(this));
+ if (model())
+ return ModelNode(m_model.data()->m_d->actualStateNode(), m_model.data(), const_cast<AbstractView*>(this));
+
+ return ModelNode();
}
} // namespace QmlDesigner
--
GitLab