Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Potential Deadlock fix #1317

Merged
merged 1 commit into from

1 participant

@jimfcarroll
Collaborator

Well ... the deadlock is potential, not the fix.

In any case, this MAY address something to do with 12578.

@jimfcarroll jimfcarroll merged commit 0b630a8 into xbmc:master
@LongChair LongChair referenced this pull request from a commit in plexinc/plex-home-theater-public
@LongChair LongChair Bandaid for Subtitles that get's incorrect charset from the server #1317
0db419d
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Mar 19, 2012
  1. Fix for deadlock - fixes 12578

    Jim Carroll authored
This page is out of date. Refresh to see the latest.
Showing with 7 additions and 4 deletions.
  1. +7 −4 xbmc/interfaces/python/XBPython.cpp
View
11 xbmc/interfaces/python/XBPython.cpp
@@ -414,11 +414,14 @@ void XBPython::Finalize()
{
CLog::Log(LOGINFO, "Python, unloading python shared library because no scripts are running anymore");
- PyEval_AcquireLock();
- PyThreadState_Swap((PyThreadState*)m_mainThreadState);
+ {
+ CSingleExit exit(m_critSection);
+ PyEval_AcquireLock();
+ PyThreadState_Swap((PyThreadState*)m_mainThreadState);
- Py_Finalize();
- PyEval_ReleaseLock();
+ Py_Finalize();
+ PyEval_ReleaseLock();
+ }
#if !(defined(__APPLE__) || defined(_WIN32))
UnloadExtensionLibs();
Something went wrong with that request. Please try again.