diff options
author | Christian Soffke <christian.soffke@gmail.com> | 2022-12-04 05:38:50 +0100 |
---|---|---|
committer | Christian Soffke <christian.soffke@gmail.com> | 2022-12-04 05:38:50 +0100 |
commit | 0550c64226a6edfd9bc51b914fb4932840543354 (patch) | |
tree | e3b4c595a5825ed7feac36805acdc5d19f98ed86 /apps | |
parent | 879b5dae3983441d60b5860a3924cf3248284a03 (diff) | |
download | rockbox-0550c64226a6edfd9bc51b914fb4932840543354.tar.gz rockbox-0550c64226a6edfd9bc51b914fb4932840543354.zip |
Bookmarks: Fix autoload return from bookmark selection
- Fix placement of parentheses from commit 780990
- Return cancel when play_bookmark fails or user declines
to erase dynamic playlist after warning
- Go back to Playlist Catalogue when user cancels out of
screen
Change-Id: Ibe8c315bdf8c6c9e696f68541b5d4d97dc0e778a
Diffstat (limited to 'apps')
-rw-r--r-- | apps/bookmark.c | 11 | ||||
-rw-r--r-- | apps/playlist_catalog.c | 2 |
2 files changed, 4 insertions, 9 deletions
diff --git a/apps/bookmark.c b/apps/bookmark.c index a3671a076f..961a14043c 100644 --- a/apps/bookmark.c +++ b/apps/bookmark.c | |||
@@ -1213,18 +1213,11 @@ int bookmark_autoload(const char* file) | |||
1213 | if (bookmark != NULL) | 1213 | if (bookmark != NULL) |
1214 | { | 1214 | { |
1215 | if (!play_bookmark(bookmark)) | 1215 | if (!play_bookmark(bookmark)) |
1216 | { | 1216 | return BOOKMARK_CANCEL; |
1217 | /* Selected bookmark not found. */ | ||
1218 | splash(HZ*2, ID2P(LANG_NOTHING_TO_RESUME)); | ||
1219 | } | ||
1220 | |||
1221 | /* Act as if autoload was done even if it failed, since the | ||
1222 | * user did make an active selection. | ||
1223 | */ | ||
1224 | return BOOKMARK_DO_RESUME; | 1217 | return BOOKMARK_DO_RESUME; |
1225 | } | 1218 | } |
1226 | 1219 | ||
1227 | return ret != (BOOKMARK_SUCCESS ? BOOKMARK_CANCEL : BOOKMARK_DONT_RESUME); | 1220 | return (ret != BOOKMARK_SUCCESS) ? BOOKMARK_CANCEL : BOOKMARK_DONT_RESUME; |
1228 | } | 1221 | } |
1229 | } | 1222 | } |
1230 | 1223 | ||
diff --git a/apps/playlist_catalog.c b/apps/playlist_catalog.c index b160d6c3f4..56a90052da 100644 --- a/apps/playlist_catalog.c +++ b/apps/playlist_catalog.c | |||
@@ -217,6 +217,8 @@ restart: | |||
217 | int res = bookmark_autoload(selected_playlist); | 217 | int res = bookmark_autoload(selected_playlist); |
218 | if (res == BOOKMARK_DO_RESUME) | 218 | if (res == BOOKMARK_DO_RESUME) |
219 | result = 0; | 219 | result = 0; |
220 | else if (res == BOOKMARK_CANCEL) | ||
221 | goto restart; | ||
220 | else | 222 | else |
221 | { | 223 | { |
222 | switch (playlist_viewer_ex(selected_playlist, &most_recent_selection)) { | 224 | switch (playlist_viewer_ex(selected_playlist, &most_recent_selection)) { |