player_thread: always clear player_control.next_song on return

pc.next_song might be non-NULL even if player.queued==true: when the decoder has started decoding the next song, but the result hasn't been read yet.

player_thread: always clear player_control.next_song on return
47b5e73a · Max Kellermann · d6a6f428 · 47b5e73a
Commit 47b5e73a authored Oct 08, 2009 by Max Kellermann
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 5 deletions

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

No files found.
--- a/src/player_thread.c
+++ b/src/player_thread.c
@@ -750,13 +750,11 @@ static void do_play(void)
 		}
 	}
-	if (player.queued) {
-		assert(pc.next_song != NULL);
-		pc.next_song = NULL;
-	}
 	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);