From f04f09e17c1857cffba1ca3ae4ecabe3caa8bfca Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Tue, 7 Feb 2017 15:44:57 +0100 Subject: [PATCH] QmlDesigner: Crash fix Throwing for an invalid model node does not make much sense. I expected it returning false and that it what it does now. Change-Id: I5c8c1a771e95a39bdb9ab7c30b4e94957464ffc1 Reviewed-by: Tim Jenssen --- src/plugins/qmldesigner/designercore/model/modelnode.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/plugins/qmldesigner/designercore/model/modelnode.cpp b/src/plugins/qmldesigner/designercore/model/modelnode.cpp index 66c69f8c88d..4b5dba99bd8 100644 --- a/src/plugins/qmldesigner/designercore/model/modelnode.cpp +++ b/src/plugins/qmldesigner/designercore/model/modelnode.cpp @@ -870,10 +870,9 @@ bool ModelNode::isSelected() const */ bool ModelNode::isRootNode() const { - if (!isValid()) { - Q_ASSERT_X(isValid(), Q_FUNC_INFO, "model node is invalid"); - throw InvalidModelNodeException(__LINE__, __FUNCTION__, __FILE__); - } + if (!isValid()) + return false; + return view()->rootModelNode() == *this; }