From a0fa4f1d94f86362e8adef0171c9f4dc966fa402 Mon Sep 17 00:00:00 2001
From: Hugo Parente Lima <hugo.pl@gmail.com>
Date: Thu, 9 Dec 2010 19:37:41 -0200
Subject: Finally fix bug#500 - "If an instance of QPrintDialog is created a
 deadlock happens on shutdown."

Reviewer: Luciano Wolf <luciano.wolf@openbossa.org>
          Marcelo Lira <marcelo.lira@openbossa.org>
---
 libshiboken/basewrapper.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'libshiboken/basewrapper.cpp')

diff --git a/libshiboken/basewrapper.cpp b/libshiboken/basewrapper.cpp
index b75a2300f..d9f5d3c07 100644
--- a/libshiboken/basewrapper.cpp
+++ b/libshiboken/basewrapper.cpp
@@ -30,6 +30,7 @@
 #include <cstring>
 #include <cstddef>
 #include <algorithm>
+#include "threadstatesaver.h"
 
 extern "C"
 {
@@ -166,10 +167,11 @@ void SbkDeallocWrapper(PyObject* pyObj)
             Shiboken::DtorCallerVisitor visitor(sbkObj);
             Shiboken::walkThroughClassHierarchy(pyObj->ob_type, &visitor);
         } else {
+            Shiboken::ThreadStateSaver threadSaver;
+            threadSaver.save();
             sbkType->d->cpp_dtor(sbkObj->d->cptr[0]);
         }
     }
-
     Shiboken::Object::deallocData(sbkObj, !sbkObj->d->containsCppWrapper);
 }
 
@@ -318,6 +320,8 @@ bool importModule(const char* moduleName, PyTypeObject*** cppApiPtr)
 
 void DtorCallerVisitor::visit(SbkObjectType* node)
 {
+    Shiboken::ThreadStateSaver threadSaver;
+    threadSaver.save();
     node->d->cpp_dtor(m_pyObj->d->cptr[m_count]);
     m_count++;
 }
-- 
cgit v1.2.3