Fix a threading deadlock causing a recording playback hang

diff --git a/player.cc b/player.cc
index 491650b1349cfddf9eed0e7edfaf356319838588..f7961903f0194c88d685edbf43a30f233b4d76ca 100644 (file)
--- a/player.cc
+++ b/player.cc
@@ -1182,6 +1182,7 @@ void Player::threadFeedPlay()
       {
         // demuxer is full and can't take anymore
         threadLock();
+        if (!threadActive) { threadUnlock(); threadCheckExit(); }
         threadWaitForSignal();
         threadUnlock();
       }

diff --git a/threadp.cc b/threadp.cc
index a40a681a8483dd8228705793eefcf6a9813961b6..e57cfdd7e83328f7af004e74a89ebb88262d9bff 100644 (file)
--- a/threadp.cc
+++ b/threadp.cc
@@ -45,7 +45,11 @@ int ThreadP::threadStart()
 void ThreadP::threadStop()
 {
        if (threadActive) { // we need this, on some implementations this will fail, if already stopped
-               threadActive = 0;
+
+               threadLock();
+               threadActive = 0; // New locking around this fixes a player lockup but could badly affect other things
+               threadUnlock();
+
                // Signal thread here in case it's waiting
                threadSignal();
                pthread_join(pthread, NULL);