aboutsummaryrefslogtreecommitdiffstats
path: root/libpyside
diff options
context:
space:
mode:
authorRenato Filho <renato.filho@openbossa.org>2011-03-22 11:12:33 -0300
committerHugo Parente Lima <hugo.pl@gmail.com>2012-03-08 16:54:04 -0300
commit58fb1c705c7c3e6fae2aa4f295991d005f4e63ae (patch)
treedbfbc6b7548417029c9114be1bfefb1286e78819 /libpyside
parenta2f110d3b93de001964c879993110e96d248ad63 (diff)
Only raise 'RuntimeError' for function call to avoid problems with contructor order calls.
Diffstat (limited to 'libpyside')
-rw-r--r--libpyside/pyside.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/libpyside/pyside.cpp b/libpyside/pyside.cpp
index 7fe39ead7..ec710a517 100644
--- a/libpyside/pyside.cpp
+++ b/libpyside/pyside.cpp
@@ -228,10 +228,10 @@ void initQObjectSubType(SbkObjectType* type, PyObject* args, PyObject* kwds)
PyObject* getMetaDataFromQObject(QObject* cppSelf, PyObject* self, PyObject* name)
{
- if (!Shiboken::Object::isValid(self))
- return 0;
-
PyObject* attr = PyObject_GenericGetAttr(self, name);
+ if (!Shiboken::Object::isValid(reinterpret_cast<SbkObject*>(self), false))
+ return attr;
+
if (attr && Property::isPropertyType(attr)) {
PyObject *value = Property::getValue(reinterpret_cast<PySideProperty*>(attr), self);
if (!value)