[fix] xbmc.Monitor onAbortRequested() hanging on exit

xbmc · Jul 6, 2012 · ba7c6fa · ba7c6fa
1 parent ffd5a56
commit ba7c6fa
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/xbmc/interfaces/python/XBPyThread.cpp b/xbmc/interfaces/python/XBPyThread.cpp
@@ -343,10 +343,7 @@ void XBPyThread::Process()
     Py_XDECREF(exc_traceback); // already NULL'd out
     Py_XDECREF(pystring);
   }
-
-  //tell xbmc.Monitor to call onAbortRequested()    
-  g_pythonParser.OnAbortRequested();
-
+
   PyObject *m = PyImport_AddModule((char*)"xbmc");
   if(!m || PyObject_SetAttrString(m, (char*)"abortRequested", PyBool_FromLong(1)))
     CLog::Log(LOGERROR, "Scriptresult: failed to set abortRequested");
@@ -434,7 +431,7 @@ void XBPyThread::stop()
     PyThreadState* old = PyThreadState_Swap((PyThreadState*)m_threadState);
 
     //tell xbmc.Monitor to call onAbortRequested()
-    g_pythonParser.OnAbortRequested();
+    g_pythonParser.OnAbortRequested(addon->ID());
 
     PyObject *m;
     m = PyImport_AddModule((char*)"xbmc");