From 7542f853b1a682ad9bf21b592f26e31e3b64521c Mon Sep 17 00:00:00 2001
From: Andreas Monzner <andreas.monzner@multimedia-labs.de>
Date: Mon, 27 Oct 2008 11:14:31 +0000
Subject: [PATCH 1/1] add workaround

---
 lib/python/connections.cpp |  3 +++
 lib/python/connections.h   | 22 +++++++++++++++++++---
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/lib/python/connections.cpp b/lib/python/connections.cpp
index 864e552..b54c07b 100644
--- a/lib/python/connections.cpp
+++ b/lib/python/connections.cpp
@@ -1,11 +1,14 @@
 #include <lib/python/connections.h>
 
 PSignal::PSignal()
+	:m_destroyed(0)
 {
 }
 
 PSignal::~PSignal()
 {
+	if (m_destroyed)
+		*m_destroyed = true;
 	Py_XDECREF(m_list);
 }
 
diff --git a/lib/python/connections.h b/lib/python/connections.h
index 76859e7..ab12313 100644
--- a/lib/python/connections.h
+++ b/lib/python/connections.h
@@ -14,6 +14,7 @@ class PSignal
 {
 protected:
 	ePyObject m_list;
+	bool *m_destroyed;
 public:
 	PSignal();
 	~PSignal();
@@ -37,13 +38,18 @@ class PSignal0: public PSignal, public Signal0<R>
 public:
 	R operator()()
 	{
+		bool destroyed=false;
+		m_destroyed = &destroyed;
 		if (m_list)
 		{
 			PyObject *pArgs = PyTuple_New(0);
 			callPython(pArgs);
 			Org_Py_DECREF(pArgs);
 		}
-		return Signal0<R>::operator()();
+		if (!destroyed) {
+			m_destroyed = 0;
+			return Signal0<R>::operator()();
+		}
 	}
 };
 
@@ -53,6 +59,8 @@ class PSignal1: public PSignal, public Signal1<R,V0>
 public:
 	R operator()(V0 a0)
 	{
+		bool destroyed=false;
+		m_destroyed = &destroyed;
 		if (m_list)
 		{
 			PyObject *pArgs = PyTuple_New(1);
@@ -60,7 +68,10 @@ public:
 			callPython(pArgs);
 			Org_Py_DECREF(pArgs);
 		}
-		return Signal1<R,V0>::operator()(a0);
+		if (!destroyed) {
+			m_destroyed = 0;
+			return Signal1<R,V0>::operator()(a0);
+		}
 	}
 };
 
@@ -70,6 +81,8 @@ class PSignal2: public PSignal, public Signal2<R,V0,V1>
 public:
 	R operator()(V0 a0, V1 a1)
 	{
+		bool destroyed=false;
+		m_destroyed = &destroyed;
 		if (m_list)
 		{
 			PyObject *pArgs = PyTuple_New(2);
@@ -78,7 +91,10 @@ public:
 			callPython(pArgs);
 			Org_Py_DECREF(pArgs);
 		}
-		return Signal2<R,V0,V1>::operator()(a0, a1);
+		if (!destroyed) {
+			m_destroyed = 0;
+			return Signal2<R,V0,V1>::operator()(a0, a1);
+		}
 	}
 };
 
-- 
2.7.4