From 85301853d6403b400c6545b8072d3962d7b66657 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sat, 11 Oct 2014 21:52:38 +0200 Subject: ThreadInputStream: call ThreadRead() inside the thread instead of Read() Fixes deadlock bug in the "mms" plugin. --- src/input/ThreadInputStream.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/input') diff --git a/src/input/ThreadInputStream.cxx b/src/input/ThreadInputStream.cxx index 821ce3e4a..235ed2b01 100644 --- 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(); -- cgit v1.2.3