player: request new song only if there is no pending command

Request the next song from the playlist (by clearing pc.next_song) only if the player command is empty. If it is not, the player may be clearing the song that has already been queued, leading to an assertion failure.

player: request new song only if there is no pending command
c042faab · Max Kellermann · be90199c · c042faab
Commit c042faab authored Oct 29, 2008 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

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

No files found.
--- a/src/player_thread.c
+++ b/src/player_thread.c
@@ -314,7 +314,8 @@ static void do_play(void)
 		}
 		if (decoder_is_idle() && !player.queued &&
-		    pc.next_song != NULL) {
+		    pc.next_song != NULL &&
+		    pc.command == PLAYER_COMMAND_NONE) {
 			/* the decoder has finished the current song;
 			   request the next song from the playlist */
 			pc.next_song = NULL;