Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix: PictureFlow splash() crash on grayscale targets

Browse source 
On targets where the grayscale framework is used, splash()
won't work (and may crash) if the overlay is not
switched off first. This is not reproducible in the simulator.

Change-Id: Ia22087c4978c8fa247d6d4c64c4b600e4393eebf
This commit is contained in:
Christian Soffke 2021-11-17 14:21:05 +01:00 committed by Solomon Peachy
parent f9ce8720c4
commit 5bd9ed801f
1 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3851,20 +3851,33 @@ static int pictureflow_main(void)
break;
#if PF_PLAYBACK_CAPABLE
case PF_CONTEXT:
if ( pf_cfg.auto_wps != 0 ) {
if ( pf_cfg.auto_wps != 0 &&
(pf_state == pf_idle || pf_state == pf_show_tracks)) {
if( pf_state == pf_idle ) {
create_track_index(center_slide.slide_index);
reset_track_list();
start_playback(true);
free_borrowed_tracks();
rb->splash(HZ*2, ID2P(LANG_ADDED_TO_PLAYLIST));
}
else if( pf_state == pf_show_tracks ) {
else
{
rb->playlist_insert_track(NULL, get_track_filename(pf_tracks.sel),
PLAYLIST_INSERT_LAST, false, true);
rb->playlist_sync(NULL);
rb->splash(HZ*2, ID2P(LANG_ADDED_TO_PLAYLIST));
}
#ifdef USEGSLIB
/*
calling splash() without switching off the grayscale overlay
beforehand, will lead to image corruption and a crash
in testing on device (iPod 4G,iPod mini)
*/
grey_show(false);
rb->lcd_clear_display();
#endif
rb->splash(HZ*2, ID2P(LANG_ADDED_TO_PLAYLIST));
#ifdef USEGSLIB
grey_show(true);
#endif
}
break;
#endif