diff options
| author | Hugo Parente Lima <hugo.pl@gmail.com> | 2010-12-13 15:22:10 -0200 |
|---|---|---|
| committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2012-03-08 16:12:48 -0300 |
| commit | db40f3e234f466e595ed618891aa2f50e403cd03 (patch) | |
| tree | 0a99539aa7e29045c8e45792637fec1ad99e9efa /libshiboken | |
| parent | ffd49b03b2677b297508457fdc94e98aaca5261a (diff) | |
Revert "Fix bug#500 - "If an instance of QPrintDialog is created a deadlock happens on shutdown.""
This reverts commit fb90a3df97b53f3ef4878d8beb719d4aa7b0c6cb.
Diffstat (limited to 'libshiboken')
| -rw-r--r-- | libshiboken/basewrapper.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/libshiboken/basewrapper.cpp b/libshiboken/basewrapper.cpp index 77f6cb719..b75a2300f 100644 --- a/libshiboken/basewrapper.cpp +++ b/libshiboken/basewrapper.cpp @@ -30,7 +30,6 @@ #include <cstring> #include <cstddef> #include <algorithm> -#include "threadstatesaver.h" extern "C" { @@ -160,8 +159,6 @@ void SbkDeallocWrapper(PyObject* pyObj) if (sbkObj->weakreflist) PyObject_ClearWeakRefs(pyObj); - Shiboken::ThreadStateSaver threadSaver; - threadSaver.save(); // If I have ownership and is valid delete C++ pointer if (sbkObj->d->hasOwnership && sbkObj->d->validCppObject) { SbkObjectType* sbkType = reinterpret_cast<SbkObjectType*>(pyObj->ob_type); @@ -172,7 +169,7 @@ void SbkDeallocWrapper(PyObject* pyObj) sbkType->d->cpp_dtor(sbkObj->d->cptr[0]); } } - threadSaver.restore(); + Shiboken::Object::deallocData(sbkObj, !sbkObj->d->containsCppWrapper); } |