diff --git a/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-407-python_callback_error_handling_fix-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-4150345-407-python_callback_error_handling_fix-0.1.patch similarity index 51% rename from packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-407-python_callback_error_handling_fix-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-4150345-407-python_callback_error_handling_fix-0.1.patch index d2c8afac28..717bae1539 100644 --- a/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-407-python_callback_error_handling_fix-0.1.patch +++ b/packages/mediacenter/xbmc/patches/xbmc-4150345-407-python_callback_error_handling_fix-0.1.patch @@ -1,15 +1,27 @@ -diff -Naur xbmc-10.1-Dharma/xbmc/lib/libPython/xbmcmodule/pyutil.cpp xbmc-10.1-Dharma.patch/xbmc/lib/libPython/xbmcmodule/pyutil.cpp ---- xbmc-10.1-Dharma/xbmc/lib/libPython/xbmcmodule/pyutil.cpp 2011-03-08 02:49:14.000000000 +0100 -+++ xbmc-10.1-Dharma.patch/xbmc/lib/libPython/xbmcmodule/pyutil.cpp 2011-06-10 21:14:07.881047162 +0200 -@@ -23,6 +23,7 @@ +From 295930bdb8091b7a1e81f6f0558ff537a78b1ea3 Mon Sep 17 00:00:00 2001 +From: Jim Carroll +Date: Fri, 10 Jun 2011 06:59:20 -0400 +Subject: [PATCH] Fixed a problem where a python error in one callback method + can effect the execution of subsequent callbacks as the + error state in the interpreter wasn't being cleared. + +--- + xbmc/interfaces/python/xbmcmodule/pyutil.cpp | 16 ++++++++++++++++ + 1 files changed, 16 insertions(+), 0 deletions(-) + +diff --git a/xbmc/interfaces/python/xbmcmodule/pyutil.cpp b/xbmc/interfaces/python/xbmcmodule/pyutil.cpp +index c7d2892..1284de5 100644 +--- a/xbmc/interfaces/python/xbmcmodule/pyutil.cpp ++++ b/xbmc/interfaces/python/xbmcmodule/pyutil.cpp +@@ -24,6 +24,7 @@ #include #include #include "addons/Skin.h" +#include "utils/log.h" #include "tinyXML/tinyxml.h" #include "utils/CharsetConverter.h" - #include "CriticalSection.h" -@@ -202,7 +203,22 @@ + #include "threads/CriticalSection.h" +@@ -197,7 +198,22 @@ void _PyXBMC_MakePendingCalls() g_callQueue.erase(iter); lock.Leave(); if (p.func) @@ -32,3 +44,6 @@ diff -Naur xbmc-10.1-Dharma/xbmc/lib/libPython/xbmcmodule/pyutil.cpp xbmc-10.1-D //(*((*iter).first))((*iter).second); lock.Enter(); iter = g_callQueue.begin(); +-- +1.7.5.4 +