diff options
| author | Jonathan Gordon <rockbox@jdgordon.info> | 2008-12-04 09:23:43 +0000 |
|---|---|---|
| committer | Jonathan Gordon <rockbox@jdgordon.info> | 2008-12-04 09:23:43 +0000 |
| commit | 7bc50d1aa545bfed89e1e8f4f0446f9b9da65a3a (patch) | |
| tree | ab7901f7d0db636bc87643b8e3f537c93e9f782e | |
| parent | 2f1892a26768aa565cad81778e8b1522c07ce144 (diff) | |
| download | rockbox-7bc50d1aa545bfed89e1e8f4f0446f9b9da65a3a.tar.gz rockbox-7bc50d1aa545bfed89e1e8f4f0446f9b9da65a3a.zip | |
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
| -rw-r--r-- | apps/playback.c | 18 |
1 files 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) | |||
| 1949 | if (dir_skip) | 1949 | if (dir_skip) |
| 1950 | { | 1950 | { |
| 1951 | dir_skip = false; | 1951 | dir_skip = false; |
| 1952 | if (playlist_next_dir(ci.new_track)) | 1952 | /* regardless of the return value we need to rebuffer. |
| 1953 | { | 1953 | if it fails the old playlist will resume, else the |
| 1954 | ci.new_track = 0; | 1954 | next dir will start playing */ |
| 1955 | audio_rebuffer(); | 1955 | playlist_next_dir(ci.new_track); |
| 1956 | goto skip_done; | 1956 | ci.new_track = 0; |
| 1957 | } | 1957 | audio_rebuffer(); |
| 1958 | else | 1958 | goto skip_done; |
| 1959 | { | ||
| 1960 | LOGFQUEUE("audio >|= codec Q_CODEC_REQUEST_FAILED"); | ||
| 1961 | return Q_CODEC_REQUEST_FAILED; | ||
| 1962 | } | ||
| 1963 | } | 1959 | } |
| 1964 | 1960 | ||
| 1965 | if (new_playlist) | 1961 | if (new_playlist) |