player_thread: on return, reset next_song only if queued

If no song was queued, then player_control.next_song might contain the value for the next QUEUE command. We must not reset that.

player_thread: on return, reset next_song only if queued
a22c93b6 · Max Kellermann · 507606bb · a22c93b6
Commit a22c93b6 authored Nov 03, 2009 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 3 deletions

player_thread.c src/player_thread.c +7 -3

No files found.
--- a/src/player_thread.c
+++ b/src/player_thread.c
@@ -889,14 +889,18 @@ static void do_play(struct decoder_control *dc)

 	player_dc_stop(&player);

-	assert(!player.queued || pc.next_song != NULL);
-	pc.next_song = NULL;
-
 	music_pipe_clear(player.pipe, player_buffer);
 	music_pipe_free(player.pipe);

 	player_lock();
+
+	if (player.queued) {
+		assert(pc.next_song != NULL);
+		pc.next_song = NULL;
+	}
+
 	pc.state = PLAYER_STATE_STOP;
+
 	player_unlock();

 	event_pipe_emit(PIPE_EVENT_PLAYLIST);