oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

ThreadInputStream: call ThreadRead() inside the thread instead of Read()

Browse Source 
Fixes deadlock bug in the "mms" plugin.
This commit is contained in:
Max Kellermann 2014-10-11 21:52:38 +02:00
parent 7cd53fb452
commit 85301853d6
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -1,4 +1,6 @@
ver 0.19.1 (not yet released) ver 0.19.1 (not yet released)
* input
- mms: fix deadlock bug
* fix build failure on Mac OS X * fix build failure on Mac OS X
ver 0.19 (2014/10/10) ver 0.19 (2014/10/10)

2
src/input/ThreadInputStream.cxx
View File

@ -88,7 +88,7 @@ ThreadInputStream::ThreadFunc()
Unlock(); Unlock();
Error error; Error error;
size_t nbytes = Read(w.data, w.size, error); size_t nbytes = ThreadRead(w.data, w.size, error);
Lock(); Lock();
cond.broadcast(); cond.broadcast();