From 7bc50d1aa545bfed89e1e8f4f0446f9b9da65a3a Mon Sep 17 00:00:00 2001 From: Jonathan Gordon Date: Thu, 4 Dec 2008 09:23:43 +0000 Subject: Fix FS#8282 - if next-dir fails resume the old playlist git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19324 a1c6a512-1295-4272-9138-f99709370657 --- apps/playback.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/apps/playback.c b/apps/playback.c index 1d9914ec31..de12916b66 100644 --- a/apps/playback.c +++ b/apps/playback.c @@ -1949,17 +1949,13 @@ static int audio_check_new_track(void) if (dir_skip) { dir_skip = false; - if (playlist_next_dir(ci.new_track)) - { - ci.new_track = 0; - audio_rebuffer(); - goto skip_done; - } - else - { - LOGFQUEUE("audio >|= codec Q_CODEC_REQUEST_FAILED"); - return Q_CODEC_REQUEST_FAILED; - } + /* regardless of the return value we need to rebuffer. + if it fails the old playlist will resume, else the + next dir will start playing */ + playlist_next_dir(ci.new_track); + ci.new_track = 0; + audio_rebuffer(); + goto skip_done; } if (new_playlist) -- cgit v1.2.3