diff options
| -rw-r--r-- | apps/playback.c | 4 | ||||
| -rw-r--r-- | apps/playlist_viewer.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/apps/playback.c b/apps/playback.c index fe9bd579d4..19e7e1276f 100644 --- a/apps/playback.c +++ b/apps/playback.c @@ -3796,4 +3796,8 @@ 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 940a6d77dc..414fdd5f8d 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 && (global_status.resume_index != -1)) + if (!have_list) { /* Try to restore the list from control file */ have_list = (playlist_resume() != -1); |