decoder/Thread: fail decoder_input_stream_open() if STOP is received

Fixes an assertion failure in tag_ape_scan() which is because decoder_input_stream_open() returns an "unready" InputStream.

decoder/Thread: fail decoder_input_stream_open() if STOP is received
e8121fdc · Max Kellermann · 21f17270 · e8121fdc
Commit e8121fdc authored Apr 21, 2016 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

DecoderThread.cxx src/decoder/DecoderThread.cxx +4 -2

No files found.
--- a/src/decoder/DecoderThread.cxx
+++ b/src/decoder/DecoderThread.cxx
@@ -68,8 +68,10 @@ decoder_input_stream_open(DecoderControl &dc, const char *uri, Error &error)
 	const ScopeLock protect(dc.mutex);

 	is->Update();
-	while (!is->IsReady() &&
-	       dc.command != DecoderCommand::STOP) {
+	while (!is->IsReady()) {
+		if (dc.command == DecoderCommand::STOP)
+			return nullptr;
+
 		dc.Wait();

 		is->Update();