diff options
| author | Frank Gevaerts <frank@gevaerts.be> | 2011-08-01 08:38:32 +0000 |
|---|---|---|
| committer | Frank Gevaerts <frank@gevaerts.be> | 2011-08-01 08:38:32 +0000 |
| commit | 94b4a8bb9a488360abd2f851eb777f50706b040d (patch) | |
| tree | 99962c61a1018f93b7f7af6d48e97e8283388e34 | |
| parent | 935d3d717fd7b36812819e35512f4383660aae89 (diff) | |
| download | rockbox-94b4a8bb9a488360abd2f851eb777f50706b040d.zip rockbox-94b4a8bb9a488360abd2f851eb777f50706b040d.tar.gz rockbox-94b4a8bb9a488360abd2f851eb777f50706b040d.tar.bz2 rockbox-94b4a8bb9a488360abd2f851eb777f50706b040d.tar.xz | |
revert r30226, which is apparently broken.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30232 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | apps/playback.c | 4 | ||||
| -rw-r--r-- | apps/playlist_viewer.c | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/apps/playback.c b/apps/playback.c index 19e7e12..fe9bd57 100644 --- a/apps/playback.c +++ b/apps/playback.c @@ -3796,8 +3796,4 @@ void audio_init(void) #endif codec_thread_resume(); thread_thaw(audio_thread_id); - - /* Load the old playlist, to ensure that behaviour with and without - * rebooting is consistent */ - playlist_resume(); } diff --git a/apps/playlist_viewer.c b/apps/playlist_viewer.c index 414fdd5..940a6d7 100644 --- a/apps/playlist_viewer.c +++ b/apps/playlist_viewer.c @@ -278,7 +278,7 @@ static bool playlist_viewer_init(struct playlist_viewer * viewer, size_t buffer_size; bool is_playing = audio_status() & (AUDIO_STATUS_PLAY | AUDIO_STATUS_PAUSE); bool have_list = filename || is_playing; - if (!have_list) + if (!have_list && (global_status.resume_index != -1)) { /* Try to restore the list from control file */ have_list = (playlist_resume() != -1); |