summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Soffke <christian.soffke@gmail.com>2021-03-23 05:17:44 +0100
committerChristian Soffke <christian.soffke@gmail.com>2021-03-23 05:17:56 +0100
commite862816773aaa0c299dcc8f5515ccdcbb15d009a (patch)
treeb0f793f9443f84d1560abb54a7b323e6bf97767c
parent36828917721a98a16db41656ff7478108bacd82e (diff)
downloadrockbox-e862816773.tar.gz
rockbox-e862816773.zip
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
-rw-r--r--apps/playlist.c2
1 files changed, 1 insertions, 1 deletions
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 = &current_playlist;
- if (!playlist->control_created && playlist_resume() == -1)
+ if (global_status.resume_index != -1 && !playlist->control_created && playlist_resume() == -1)
return false;
}