From db40f3e234f466e595ed618891aa2f50e403cd03 Mon Sep 17 00:00:00 2001 From: Hugo Parente Lima Date: Mon, 13 Dec 2010 15:22:10 -0200 Subject: Revert "Fix bug#500 - "If an instance of QPrintDialog is created a deadlock happens on shutdown."" This reverts commit fb90a3df97b53f3ef4878d8beb719d4aa7b0c6cb. --- libshiboken/basewrapper.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'libshiboken') 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 #include #include -#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(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); } -- cgit v1.2.3