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

Fixes deadlock bug in the "mms" plugin.

ThreadInputStream: call ThreadRead() inside the thread instead of Read()
85301853 · Max Kellermann · 7cd53fb4 · 85301853 · 85301853
Commit 85301853 authored Oct 11, 2014 by Max Kellermann
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

NEWS NEWS +2 -0

ThreadInputStream.cxx src/input/ThreadInputStream.cxx +1 -1

No files found.
--- a/NEWS
+++ b/NEWS
 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)

--- a/src/input/ThreadInputStream.cxx
+++ b/src/input/ThreadInputStream.cxx
@@ -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();