Merge branch 'v0.20.x'

This commit is contained in:
Max Kellermann
2018-10-29 23:06:32 +01:00
5 changed files with 14 additions and 16 deletions

View File

@@ -606,6 +606,8 @@ Player::SeekDecoder() noexcept
pc.outputs.Cancel();
}
idle_add(IDLE_PLAYER);
if (!dc.IsSeekableCurrentSong(*pc.next_song)) {
/* the decoder is already decoding the "next" song -
stop it and start the previous song again */