Merge branch 'develop' of github.com:plonk/peercast-yt into develop

plonk · Jan 27, 2022 · 1f63c2b · 1f63c2b
2 parents dcf0bed + e978f7a
commit 1f63c2b
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/core/common/chanpacket.cpp b/core/common/chanpacket.cpp
@@ -244,16 +244,25 @@ void    ChanPacketBuffer::readPacket(ChanPacket &pack)
 {
     unsigned int tim = sys->getTime();
 
+    lock.lock();
+
     if (readPos < firstPos)
+    {
+        lock.unlock();
         throw StreamException("Read too far behind");
+    }
 
     while (readPos >= writePos)
     {
+        lock.unlock();
         sys->sleepIdle();
         if ((sys->getTime() - tim) > 30)
+        {
             throw TimeoutException();
+        }
+        lock.lock();
     }
-    lock.lock();
+
     pack = packets[readPos%MAX_PACKETS];
     readPos++;
     lock.unlock();