Revert "player/Thread: remove unnecessary "pipe" check"

This reverts commit ff3e2c05. The check was necessary, after all, because this is what checked whether the decoder had finished the current or the next song. > The "queued" flag can only possibly be set if the decoder is still > decoding the current song or if the decoder is stopped. That was wrong because ProcessCommand() sets `queued=true` and also starts the decoder (if it was idle). > This is also what the following assert() checks. That was also wrong, because the assert() has two conditions. Closes https://github.com/MusicPlayerDaemon/MPD/issues/566

Revert "player/Thread: remove unnecessary "pipe" check"
304d45b5 · Max Kellermann · 0f488dce · 304d45b5 · 304d45b5
Commit 304d45b5 authored May 31, 2019 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

NEWS NEWS +1 -0

Thread.cxx src/player/Thread.cxx +1 -1

No files found.
--- a/NEWS
+++ b/NEWS
 ver 0.21.10 (not yet released)
+* fix crash bug (0.21.9 regression)

 ver 0.21.9 (2019/05/20)
 * input

--- a/src/player/Thread.cxx
+++ b/src/player/Thread.cxx
@@ -996,7 +996,7 @@ Player::Run() noexcept
 			}
 		}

-		if (dc.IsIdle() && queued) {
+		if (dc.IsIdle() && queued && IsDecoderAtCurrentSong()) {
 			/* the decoder has finished the current song;
 			   make it decode the next song */