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

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

2
NEWS
View File

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

View File

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