1
0
Fork 0
forked from len0rd/rockbox

pictureflow: fix greylib crash when album not found

Change-Id: Ic9c532234613c805d851710b960db0c91d1049ab
This commit is contained in:
Christian Soffke 2025-04-03 14:08:11 +02:00 committed by Solomon Peachy
parent 4d616be48b
commit 66a18f7c30

View file

@ -3256,9 +3256,6 @@ static bool sort_albums(int new_sorting, bool from_settings)
rb->lcd_update(); rb->lcd_update();
#endif #endif
rb->splash(HZ, sort_options[pf_cfg.sort_albums_by]); rb->splash(HZ, sort_options[pf_cfg.sort_albums_by]);
#ifdef USEGSLIB
grey_show(true);
#endif
} }
hash_album = mfnv(get_album_name(center_index)); hash_album = mfnv(get_album_name(center_index));
@ -3276,8 +3273,12 @@ static bool sort_albums(int new_sorting, bool from_settings)
is_initial_slide = true; is_initial_slide = true;
create_pf_thread(); create_pf_thread();
reselect(hash_album, hash_artist); reselect(hash_album, hash_artist); /* splash if not found */
#ifdef USEGSLIB
if (!from_settings)
grey_show(true);
#endif
return true; return true;
} }
@ -4620,7 +4621,6 @@ static bool init(void)
reset_slides(); reset_slides();
#ifdef USEGSLIB #ifdef USEGSLIB
grey_show(true);
grey_set_drawmode(DRMODE_FG); grey_set_drawmode(DRMODE_FG);
#endif #endif
rb->lcd_set_drawmode(DRMODE_FG); rb->lcd_set_drawmode(DRMODE_FG);
@ -4638,7 +4638,10 @@ static bool reinit(void)
cleanup(); cleanup();
if (init()) if (init())
{ {
reselect(hash_album, hash_artist); reselect(hash_album, hash_artist); /* splash if not found */
#ifdef USEGSLIB
grey_show(true);
#endif
return true; return true;
} }
return false; return false;
@ -4984,7 +4987,10 @@ enum plugin_status plugin_start(const void *parameter)
if (init()) if (init())
{ {
set_initial_slide(file_id3 ? file : NULL); set_initial_slide(file_id3 ? file : NULL); /* may call splash */
#ifdef USEGSLIB
grey_show(true);
#endif
ret = pictureflow_main(); ret = pictureflow_main();
} }
else else