len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-09 21:22:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

PictureFlow: Don't insert tracks if track list not available

Browse source 
Change-Id: Ic6d5083bfe7daf3a8639b1405b8be9dae73eb30c
This commit is contained in:
Christian Soffke 2022-01-03 20:34:46 +01:00 • committed by William Wilgus
parent de8ee6c9e9
commit 122ce0089a
1 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

19
apps/plugins/pictureflow/pictureflow.c
View file

@ -3697,14 +3697,20 @@ static bool playlist_insert(int position, bool queue, bool create_new)
return true; return true;
} }
static void track_list_ready(void) static bool track_list_ready(void)
{ {
if (pf_state != pf_show_tracks) if (pf_state != pf_show_tracks)
{ {
rb->splash(0, ID2P(LANG_WAIT)); rb->splash(0, ID2P(LANG_WAIT));
create_track_index(center_slide.slide_index); create_track_index(center_slide.slide_index);
if (pf_tracks.count == 0)
{
free_borrowed_tracks();
return false;
}
reset_track_list(); reset_track_list();
} }
return true;
} }
/** /**
@ -3721,7 +3727,13 @@ static void show_current_playlist_menu(void)
rb->lcd_clear_display(); rb->lcd_clear_display();
rb->lcd_update(); rb->lcd_update();
#endif #endif
track_list_ready(); if (!track_list_ready())
{
#ifdef USEGSLIB
grey_show(true);
#endif
return;
}
insert_whole_album = pf_state != pf_show_tracks; insert_whole_album = pf_state != pf_show_tracks;
FOR_NB_SCREENS(i) FOR_NB_SCREENS(i)
rb->viewportmanager_theme_enable(i, true, NULL); rb->viewportmanager_theme_enable(i, true, NULL);
@ -3753,7 +3765,7 @@ static bool start_playback(bool return_to_WPS)
rb->lcd_update(); rb->lcd_update();
#endif /* USEGSLIB */ #endif /* USEGSLIB */
if (!rb->warn_on_pl_erase()) if (!rb->warn_on_pl_erase() || !track_list_ready())
{ {
#ifdef USEGSLIB #ifdef USEGSLIB
grey_show(true); grey_show(true);
@ -3761,7 +3773,6 @@ static bool start_playback(bool return_to_WPS)
return false; return false;
} }
track_list_ready();
insert_whole_album = true; insert_whole_album = true;
int start_index = pf_tracks.sel; int start_index = pf_tracks.sel;
bool shuffle = rb->global_settings->playlist_shuffle; bool shuffle = rb->global_settings->playlist_shuffle;