From 629a4d66c17c38a3f458d4aa90a9804aca5a4645 Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@nokia.com>
Date: Tue, 13 Apr 2010 16:16:35 +0200
Subject: [PATCH] Fix crash for a dangling pointer
Task-Number: BAUHAUS-574
Reviewed-by: kkoehne
---
.../core/instances/nodeinstancemetaobject.cpp | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/plugins/qmldesigner/core/instances/nodeinstancemetaobject.cpp b/src/plugins/qmldesigner/core/instances/nodeinstancemetaobject.cpp
index befbc524eea..bdd11310325 100644
--- a/src/plugins/qmldesigner/core/instances/nodeinstancemetaobject.cpp
+++ b/src/plugins/qmldesigner/core/instances/nodeinstancemetaobject.cpp
@@ -62,10 +62,12 @@ int NodeInstanceMetaObject::metaCall(QMetaObject::Call call, int id, void **a)
}
}
} else {
- if (parent())
- metaCallReturnValue = parent()->metaCall(call, id, a);
- else
- metaCallReturnValue = object()->qt_metacall(call, id, a);
+ if (!QObjectPrivate::get(object())->wasDeleted) {
+ if (parent())
+ metaCallReturnValue = parent()->metaCall(call, id, a);
+ else
+ metaCallReturnValue = object()->qt_metacall(call, id, a);
+ }
if (call == QMetaObject::WriteProperty
&& !property(id).hasNotifySignal()
--
GitLab