From c042faab42e0a2b2c6e25d7e1a84084ffc181d20 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 29 Oct 2008 17:28:49 +0100 Subject: 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. --- src/player_thread.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/player_thread.c b/src/player_thread.c index af016df6..c06be3d8 100644 --- 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; -- cgit v1.2.3