player_thread: check pipe size again before exiting

When the decoder is finished, break out of the player loop only after another player.pipe check. We did check the pipe size a few lines above, but that check was kind of racy.

player_thread: check pipe size again before exiting
9ee53bc7 · Max Kellermann · aa7f5dec · 9ee53bc7
Commit 9ee53bc7 authored Jun 02, 2009 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

player_thread.c src/player_thread.c +5 -1

No files found.
--- a/src/player_thread.c
+++ b/src/player_thread.c
@@ -730,7 +730,11 @@ static void do_play(void)
 			if (!player_song_border(&player))
 				break;
 		} else if (decoder_is_idle()) {
-			break;
+			/* check the size of the pipe again, because
+			   the decoder thread may have added something
+			   since we last checked */
+			if (music_pipe_size(player.pipe) == 0)
+				break;
 		} else {
 			/* the decoder is too busy and hasn't provided
 			   new PCM data in time: send silence (if the