summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorChristian Soffke <christian.soffke@gmail.com>2022-01-03 20:34:46 +0100
committerWilliam Wilgus <me.theuser@yahoo.com>2022-01-04 18:06:42 -0500
commit122ce0089aaac340eab79f7701eb4a329e6c1c21 (patch)
tree04cc3b618fb5e9f2a41497e6468ebd2a662f1722 /apps
parentde8ee6c9e98af821bcf1579ea2edac2a561a2fee (diff)
downloadrockbox-122ce0089aaac340eab79f7701eb4a329e6c1c21.tar.gz
rockbox-122ce0089aaac340eab79f7701eb4a329e6c1c21.zip
PictureFlow: Don't insert tracks if track list not available
Change-Id: Ic6d5083bfe7daf3a8639b1405b8be9dae73eb30c
Diffstat (limited to 'apps')
-rw-r--r--apps/plugins/pictureflow/pictureflow.c19
1 files changed, 15 insertions, 4 deletions
diff --git a/apps/plugins/pictureflow/pictureflow.c b/apps/plugins/pictureflow/pictureflow.c
index 2bf4127242..b1162597f2 100644
--- a/apps/plugins/pictureflow/pictureflow.c
+++ b/apps/plugins/pictureflow/pictureflow.c
@@ -3697,14 +3697,20 @@ static bool playlist_insert(int position, bool queue, bool create_new)
return true;
}
-static void track_list_ready(void)
+static bool track_list_ready(void)
{
if (pf_state != pf_show_tracks)
{
rb->splash(0, ID2P(LANG_WAIT));
create_track_index(center_slide.slide_index);
+ if (pf_tracks.count == 0)
+ {
+ free_borrowed_tracks();
+ return false;
+ }
reset_track_list();
}
+ return true;
}
/**
@@ -3721,7 +3727,13 @@ static void show_current_playlist_menu(void)
rb->lcd_clear_display();
rb->lcd_update();
#endif
- track_list_ready();
+ if (!track_list_ready())
+ {
+#ifdef USEGSLIB
+ grey_show(true);
+#endif
+ return;
+ }
insert_whole_album = pf_state != pf_show_tracks;
FOR_NB_SCREENS(i)
rb->viewportmanager_theme_enable(i, true, NULL);
@@ -3753,7 +3765,7 @@ static bool start_playback(bool return_to_WPS)
rb->lcd_update();
#endif /* USEGSLIB */
- if (!rb->warn_on_pl_erase())
+ if (!rb->warn_on_pl_erase() || !track_list_ready())
{
#ifdef USEGSLIB
grey_show(true);
@@ -3761,7 +3773,6 @@ static bool start_playback(bool return_to_WPS)
return false;
}
- track_list_ready();
insert_whole_album = true;
int start_index = pf_tracks.sel;
bool shuffle = rb->global_settings->playlist_shuffle;