From e862816773aaa0c299dcc8f5515ccdcbb15d009a Mon Sep 17 00:00:00 2001 From: Christian Soffke Date: Tue, 23 Mar 2021 05:17:44 +0100 Subject: Fix FS#13278: error message when playing a song with Rockbox for the very first time The function to check whether a playlist has been modified will now only try to resume a playlist, if the global resume index is not -1. This also means that replacing a finished (modified) playlist will not produce a warning anymore if Rockbox has been restarted in between. In that respect, the behavior is identical to what it was *before* 46085c897854. Change-Id: Ib95f89043274f1c72c75023d1506fc093aaf4cf9 --- apps/playlist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'apps') diff --git a/apps/playlist.c b/apps/playlist.c index 3fa8f80729..228ddcfd7e 100644 --- a/apps/playlist.c +++ b/apps/playlist.c @@ -3438,7 +3438,7 @@ bool playlist_modified(const struct playlist_info* playlist) if (!playlist) { playlist = ¤t_playlist; - if (!playlist->control_created && playlist_resume() == -1) + if (global_status.resume_index != -1 && !playlist->control_created && playlist_resume() == -1) return false; } -- cgit v1.2.3