feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix crash for a dangling pointer

Browse Source 
Task-Number: BAUHAUS-574
Reviewed-by: kkoehne
(cherry picked from commit 629a4d66c1)
This commit is contained in:
Marco Bubke
2010-04-13 16:16:35 +02:00
committed by con
parent decc1b1aa1
commit fa2d217c6b
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmldesigner/core/instances/nodeinstancemetaobject.cpp
View File

@@ -62,10 +62,12 @@ int NodeInstanceMetaObject::metaCall(QMetaObject::Call call, int id, void **a)
} }
} }
} else { } else {
if (!QObjectPrivate::get(object())->wasDeleted) {
if (parent()) if (parent())
metaCallReturnValue = parent()->metaCall(call, id, a); metaCallReturnValue = parent()->metaCall(call, id, a);
else else
metaCallReturnValue = object()->qt_metacall(call, id, a); metaCallReturnValue = object()->qt_metacall(call, id, a);
}
if (call == QMetaObject::WriteProperty if (call == QMetaObject::WriteProperty
&& !property(id).hasNotifySignal() && !property(id).hasNotifySignal()