summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHugo Parente Lima <hugo.pl@gmail.com>2010-12-13 15:22:10 -0200
committerHugo Parente Lima <hugo.pl@gmail.com>2010-12-13 15:24:26 -0200
commit701b31ef3ddae7c43380d1513f9938f70f46eb7e (patch)
tree6a9cdecd98b034b9aed98e420360ed0b374fa608
parentfb90a3df97b53f3ef4878d8beb719d4aa7b0c6cb (diff)
downloadshiboken-701b31ef3ddae7c43380d1513f9938f70f46eb7e.tar.gz
shiboken-701b31ef3ddae7c43380d1513f9938f70f46eb7e.tar.xz
shiboken-701b31ef3ddae7c43380d1513f9938f70f46eb7e.zip
Revert "Fix bug#500 - "If an instance of QPrintDialog is created a deadlock happens on shutdown.""
This reverts commit fb90a3df97b53f3ef4878d8beb719d4aa7b0c6cb.
-rw-r--r--libshiboken/basewrapper.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/libshiboken/basewrapper.cpp b/libshiboken/basewrapper.cpp
index 96a0f6f8..b3fc3801 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);
}