player_thread: reset pc.next_song only if queued

When we reset pc.next_song if there is no song queued, this might cause a race condition: the next song to be played is cleared, while pc.command was already set. Clear the "next_song" only if there is a song queued for the current do_play() invocation.

player_thread: reset pc.next_song only if queued
799d1c9d · Max Kellermann · 40393ae6 · 799d1c9d
Commit 799d1c9d authored Feb 10, 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
@@ -92,7 +92,6 @@ static void player_stop_decoder(void)
 {
 	dc_stop(&pc.notify);
 	pc.state = PLAYER_STATE_STOP;
-	pc.next_song = NULL;
 	event_pipe_emit(PIPE_EVENT_PLAYLIST);
 }
@@ -511,6 +510,11 @@ static void do_play(void)
 		}
 	}
+	if (player.queued) {
+		assert(pc.next_song != NULL);
+		pc.next_song = NULL;
+	}
 	player_stop_decoder();
 }