Fixed issue #191

Author: Ayuto

src/core/modules/listeners/listeners_manager.cpp

@@ -39,7 +39,7 @@ void CListenerManager::RegisterListener(PyObject* pCallable)
 	object oCallable = object(handle<>(borrowed(pCallable)));
 
 	// Is the callable already in the vector?
-	if( !m_vecCallables.HasElement(oCallable) )
+	if( !IsRegistered(oCallable) )
 	{
 		m_vecCallables.AddToTail(oCallable);
 	}
@@ -57,7 +57,7 @@ void CListenerManager::UnregisterListener(PyObject* pCallable)
 	// Get the object instance of the callable
 	object oCallable = object(handle<>(borrowed(pCallable)));
 
-	int index = m_vecCallables.Find(oCallable);
+	int index = FindCallback(oCallable); //m_vecCallables.Find(oCallable);
 
 	if (index == -1) {
 		BOOST_RAISE_EXCEPTION(PyExc_ValueError, "Callback not registered.")
@@ -96,7 +96,19 @@ int CListenerManager::GetCount()
 //-----------------------------------------------------------------------------
 bool CListenerManager::IsRegistered(object oCallback)
 {
-	return m_vecCallables.HasElement(oCallback);
+	return FindCallback(oCallback) != -1;
+	//return m_vecCallables.HasElement(oCallback);
+}
+
+int CListenerManager::FindCallback(object oCallback)
+{
+	for (int i=0; i < m_vecCallables.Count(); ++i) {
+		object oCurrent  = m_vecCallables[i];
+		if (is_same_func(oCallback, oCurrent)) {
+			return i;
+		}
+	}
+	return -1;
 }
 
 object CListenerManager::__getitem__(unsigned int index)
@@ -111,3 +123,29 @@ void CListenerManager::clear()
 {
 	m_vecCallables.RemoveAll();
 }
+
+
+//-----------------------------------------------------------------------------
+// Functions
+//-----------------------------------------------------------------------------
+bool is_same_func(object f1, object f2)
+{
+	object self1, self2;
+	try {
+		self1 = f1.attr("__self__");
+	}
+	catch (...) {
+		PyErr_Clear();
+		return f1 == f2;
+	}
+
+	try {
+		self2 = f2.attr("__self__");
+	}
+	catch (...) {
+		PyErr_Clear();
+		return f1 == f2;
+	}
+
+	return self1.ptr() == self2.ptr() && f1.attr("__func__") == f2.attr("__func__");
+}

src/core/modules/listeners/listeners_manager.h

@@ -70,9 +70,17 @@ class CListenerManager
 	object __getitem__(unsigned int index);
 	void clear();
 
+	int FindCallback(object oCallback);
+
 public:
 	CUtlVector<object> m_vecCallables;
 };
 
 
+//-----------------------------------------------------------------------------
+// Functions
+//-----------------------------------------------------------------------------
+bool is_same_func(object f1, object f2);
+
+
 #endif // _LISTENERS_MANAGER_H