aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Hartmann <Thomas.Hartmann@digia.com>2014-08-15 11:07:54 +0200
committerThomas Hartmann <Thomas.Hartmann@digia.com>2014-08-15 12:18:42 +0200
commitf6dab5c0e3f5589da78f9df72c24d33444ae7e4a (patch)
treeffe6af4e979a4ec1474455aac5402d8114ac5580
parentf1ca76f6c2502448c7a653eada1775acdca9ae5c (diff)
QmlDesigner.FormeEditor: Crash fix
The model can already be detached when calling delayedReset. In this case we just do nothing. Change-Id: I889fcc4e267dac3403c2e35b8f77b1e4fb5b8050 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
-rw-r--r--src/plugins/qmldesigner/components/formeditor/formeditorview.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
index 5b7cdca461..ad34739ac0 100644
--- a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
@@ -646,7 +646,7 @@ void FormEditorView::delayedReset()
m_resizeTool->clear();
m_dragTool->clear();
m_scene->clearFormEditorItems();
- if (QmlItemNode::isValidQmlItemNode(rootModelNode()))
+ if (isAttached() && QmlItemNode::isValidQmlItemNode(rootModelNode()))
setupFormEditorItemTree(rootModelNode());
}