summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTeruaki Kawashima <teru@rockbox.org>2009-08-29 16:25:04 +0000
committerTeruaki Kawashima <teru@rockbox.org>2009-08-29 16:25:04 +0000
commit5b2a599d63722d2323cf18aa089f333350318f34 (patch)
tree2eb41e7decd54e0af1ca4408815e8f5e0c513d05
parent90a29dd611e9f0f1f9741272638f6c7b7d33ac4f (diff)
downloadrockbox-5b2a599d63722d2323cf18aa089f333350318f34.tar.gz
rockbox-5b2a599d63722d2323cf18aa089f333350318f34.tar.bz2
rockbox-5b2a599d63722d2323cf18aa089f333350318f34.zip
fix FS#10465 and return GO_TO_ROOT instead of SYS_USB_CONNECTED in gui_wps_show.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22538 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/gui/wps.c18
1 files changed, 11 insertions, 7 deletions
diff --git a/apps/gui/wps.c b/apps/gui/wps.c
index 1d97501bc1..f624365026 100644
--- a/apps/gui/wps.c
+++ b/apps/gui/wps.c
@@ -376,7 +376,7 @@ bool ffwd_rew(int button)
if (button == ACTION_TOUCHSCREEN)
button = wps_get_touchaction(gui_wps[SCREEN_MAIN].data);
#endif
- }
+ }
}
return usb;
}
@@ -660,7 +660,7 @@ int wps_get_touchaction(struct wps_data *data)
return ACTION_REDRAW;
}
}
- }
+ }
}
regions = regions->next;
}
@@ -1024,7 +1024,7 @@ long gui_wps_show(void)
{
gwps_leave_wps();
if (quick_screen_quick(button))
- return SYS_USB_CONNECTED;
+ return GO_TO_ROOT;
restore = true;
}
break;
@@ -1036,7 +1036,7 @@ long gui_wps_show(void)
{
gwps_leave_wps();
if (quick_screen_f3(BUTTON_F3))
- return SYS_USB_CONNECTED;
+ return GO_TO_ROOT;
restore = true;
}
break;
@@ -1048,7 +1048,7 @@ long gui_wps_show(void)
{
gwps_leave_wps();
if (1 == gui_syncpitchscreen_run())
- return SYS_USB_CONNECTED;
+ return GO_TO_ROOT;
restore = true;
}
break;
@@ -1076,7 +1076,8 @@ long gui_wps_show(void)
case ACTION_WPS_ID3SCREEN:
{
gwps_leave_wps();
- browse_id3();
+ if (browse_id3())
+ return GO_TO_ROOT;
restore = true;
}
break;
@@ -1123,12 +1124,15 @@ long gui_wps_show(void)
case ACTION_WPS_VIEW_PLAYLIST:
gwps_leave_wps();
if (playlist_viewer()) /* true if USB connected */
- return SYS_USB_CONNECTED;
+ return GO_TO_ROOT;
restore = true;
break;
default:
if(default_event_handler(button) == SYS_USB_CONNECTED)
+ {
+ gwps_leave_wps();
return GO_TO_ROOT;
+ }
update = true;
break;
}