From 87e518ab537c5edb7064dd9a20d2362b2e98aee9 Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Tue, 17 Jun 2014 14:59:17 +0200 Subject: [PATCH] QmlDesigner: Improve NodeInstanceServer::hasInstance Test if instance is valid. Change-Id: I748f3f95a2ad0669899e8029fdde4de0658ad11b Reviewed-by: Tim Jenssen --- .../qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp | 4 ++-- .../qml/qmlpuppet/qmlpuppet/instances/nodeinstanceserver.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp index d3486d22617..aa991e6e142 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp @@ -145,7 +145,7 @@ bool NodeInstanceServer::hasInstanceForId(qint32 id) const if (id < 0) return false; - return m_idInstanceHash.contains(id); + return m_idInstanceHash.contains(id) && m_idInstanceHash.value(id).isValid(); } ServerNodeInstance NodeInstanceServer::instanceForObject(QObject *object) const @@ -159,7 +159,7 @@ bool NodeInstanceServer::hasInstanceForObject(QObject *object) const if (object == 0) return false; - return m_objectInstanceHash.contains(object); + return m_objectInstanceHash.contains(object) && m_objectInstanceHash.value(object).isValid(); } void NodeInstanceServer::setRenderTimerInterval(int timerInterval) diff --git a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/nodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/nodeinstanceserver.cpp index b426c48d8f5..3abf5997733 100644 --- a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/nodeinstanceserver.cpp +++ b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/nodeinstanceserver.cpp @@ -145,7 +145,7 @@ bool NodeInstanceServer::hasInstanceForId(qint32 id) const if (id < 0) return false; - return m_idInstanceHash.contains(id); + return m_idInstanceHash.contains(id) && m_idInstanceHash.value(id).isValid(); } ServerNodeInstance NodeInstanceServer::instanceForObject(QObject *object) const @@ -159,7 +159,7 @@ bool NodeInstanceServer::hasInstanceForObject(QObject *object) const if (object == 0) return false; - return m_objectInstanceHash.contains(object); + return m_objectInstanceHash.contains(object) && m_objectInstanceHash.value(object).isValid(); } void NodeInstanceServer::setRenderTimerInterval(int timerInterval)