summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2007-04-22 12:38:11 +0000
committerJens Arnold <amiconn@rockbox.org>2007-04-22 12:38:11 +0000
commit5070f41bfce407ec9b050a19777371ee9ae485f2 (patch)
tree66ba27a681dda907473cf6fd999e410012138ae7 /apps
parentee80bcaa79bfb30da0860c0ce47dbc6b7f4c0ed7 (diff)
downloadrockbox-5070f41bfce407ec9b050a19777371ee9ae485f2.tar.gz
rockbox-5070f41bfce407ec9b050a19777371ee9ae485f2.zip
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.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13241 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/gui/gwps.c38
1 files changed, 16 insertions, 22 deletions
diff --git a/apps/gui/gwps.c b/apps/gui/gwps.c
index 0819d122f5..ed653a8535 100644
--- a/apps/gui/gwps.c
+++ b/apps/gui/gwps.c
@@ -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 */
}