diff options
author | Christian Soffke <christian.soffke@gmail.com> | 2023-09-21 07:45:13 +0200 |
---|---|---|
committer | Christian Soffke <christian.soffke@gmail.com> | 2023-10-10 12:03:52 -0400 |
commit | 75befe19ef1bea25f1eca9fd4884835dfd1694a2 (patch) | |
tree | a6b51c263a220cc58db96ecee6a0eb7980ffea8d /apps/bookmark.c | |
parent | a0c29d8857ee3c697a9c7f8b396b3a25c88acab4 (diff) | |
download | rockbox-75befe19ef1bea25f1eca9fd4884835dfd1694a2.tar.gz rockbox-75befe19ef1bea25f1eca9fd4884835dfd1694a2.zip |
Hide Bookmark menu for new dynamically generated playlists
The bookmark menu with the option to create a bookmark
was inadvertently displayed for new dynamic playlists,
that had no associated folder or playlist file on disk.
(e.g. after selecting some track from the database for
playback), until the playlist was modified by the user.
Change-Id: I9d6809e4d03603c651459415327f28e38162ad53
Diffstat (limited to 'apps/bookmark.c')
-rw-r--r-- | apps/bookmark.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/apps/bookmark.c b/apps/bookmark.c index 0b468bdb76..3db049475d 100644 --- a/apps/bookmark.c +++ b/apps/bookmark.c | |||
@@ -1291,7 +1291,8 @@ bool bookmark_exists(void) | |||
1291 | 1291 | ||
1292 | char* name = playlist_get_name(NULL, global_temp_buffer, | 1292 | char* name = playlist_get_name(NULL, global_temp_buffer, |
1293 | sizeof(global_temp_buffer)); | 1293 | sizeof(global_temp_buffer)); |
1294 | if (generate_bookmark_file_name(bm_filename, sizeof(bm_filename), name, -1)) | 1294 | if (!playlist_dynamic_only() && |
1295 | generate_bookmark_file_name(bm_filename, sizeof(bm_filename), name, -1)) | ||
1295 | { | 1296 | { |
1296 | exist = file_exists(bm_filename); | 1297 | exist = file_exists(bm_filename); |
1297 | } | 1298 | } |
@@ -1311,8 +1312,10 @@ bool bookmark_is_bookmarkable_state(void) | |||
1311 | /* no track playing */ | 1312 | /* no track playing */ |
1312 | (playlist_get_resume_info(&resume_index) == -1) || | 1313 | (playlist_get_resume_info(&resume_index) == -1) || |
1313 | /* invalid queue info */ | 1314 | /* invalid queue info */ |
1314 | (playlist_modified(NULL))) | 1315 | (playlist_modified(NULL)) || |
1315 | /* can't bookmark while in the queue */ | 1316 | /* can't bookmark playlists modified by user */ |
1317 | (playlist_dynamic_only())) | ||
1318 | /* can't bookmark playlists without associated folder or playlist file */ | ||
1316 | { | 1319 | { |
1317 | return false; | 1320 | return false; |
1318 | } | 1321 | } |