devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Consolidated several potential places of return from WPS into one. Fixes the 'Return from WPS at end of playlist always brings up the root menu.' bug on hwcodec.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13241 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jens Arnold 2007-04-22 12:38:11 +00:00
parent ee80bcaa79
commit 5070f41bfc
1 changed files with 16 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

38
apps/gui/gwps.c
View file

@ -614,15 +614,26 @@ long gui_wps_show(void)
FOR_NB_SCREENS(i)
{
if(update(&gui_wps[i]))
update_failed = true;
}
if (update_failed)
{
return GO_TO_ROOT;
exit = true;
}
update_track = false;
}
if (restore &&
((restoretimer == 0) ||
(restoretimer < current_tick)))
{
restore = false;
restoretimer = 0;
if (gui_wps_display()) {
exit = true;
}
else if (wps_state.id3){
FOR_NB_SCREENS(i)
gui_wps_refresh(&gui_wps[i], 0, WPS_REFRESH_NON_STATIC);
}
}
if (exit) {
action_signalscreenchange();
#ifdef HAVE_LCD_CHARCELLS
@ -646,23 +657,6 @@ long gui_wps_show(void)
if ( button )
ata_spin();
if (restore &&
((restoretimer == 0) ||
(restoretimer < current_tick)))
{
restore = false;
restoretimer = 0;
if (gui_wps_display())
{
return GO_TO_ROOT;
}
if (wps_state.id3){
FOR_NB_SCREENS(i)
gui_wps_refresh(&gui_wps[i], 0, WPS_REFRESH_NON_STATIC);
}
}
}
return GO_TO_ROOT; /* unreachable - just to reduce compiler warnings */
}