mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 13:46:49 +00:00
xbmc: update python callback error handling fix patch
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
parent
bb798a1519
commit
7abfdb2aab
@ -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
|
From 295930bdb8091b7a1e81f6f0558ff537a78b1ea3 Mon Sep 17 00:00:00 2001
|
||||||
--- xbmc-10.1-Dharma/xbmc/lib/libPython/xbmcmodule/pyutil.cpp 2011-03-08 02:49:14.000000000 +0100
|
From: Jim Carroll <thecarrolls@jiminger.com>
|
||||||
+++ xbmc-10.1-Dharma.patch/xbmc/lib/libPython/xbmcmodule/pyutil.cpp 2011-06-10 21:14:07.881047162 +0200
|
Date: Fri, 10 Jun 2011 06:59:20 -0400
|
||||||
@@ -23,6 +23,7 @@
|
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 <wchar.h>
|
#include <wchar.h>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include "addons/Skin.h"
|
#include "addons/Skin.h"
|
||||||
+#include "utils/log.h"
|
+#include "utils/log.h"
|
||||||
#include "tinyXML/tinyxml.h"
|
#include "tinyXML/tinyxml.h"
|
||||||
#include "utils/CharsetConverter.h"
|
#include "utils/CharsetConverter.h"
|
||||||
#include "CriticalSection.h"
|
#include "threads/CriticalSection.h"
|
||||||
@@ -202,7 +203,22 @@
|
@@ -197,7 +198,22 @@ void _PyXBMC_MakePendingCalls()
|
||||||
g_callQueue.erase(iter);
|
g_callQueue.erase(iter);
|
||||||
lock.Leave();
|
lock.Leave();
|
||||||
if (p.func)
|
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);
|
//(*((*iter).first))((*iter).second);
|
||||||
lock.Enter();
|
lock.Enter();
|
||||||
iter = g_callQueue.begin();
|
iter = g_callQueue.begin();
|
||||||
|
--
|
||||||
|
1.7.5.4
|
||||||
|
|
Loading…
x
Reference in New Issue
Block a user