diff options
Diffstat (limited to 'apps/gui')
-rw-r--r-- | apps/gui/wps.c | 18 |
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) | |||
376 | if (button == ACTION_TOUCHSCREEN) | 376 | if (button == ACTION_TOUCHSCREEN) |
377 | button = wps_get_touchaction(gui_wps[SCREEN_MAIN].data); | 377 | button = wps_get_touchaction(gui_wps[SCREEN_MAIN].data); |
378 | #endif | 378 | #endif |
379 | } | 379 | } |
380 | } | 380 | } |
381 | return usb; | 381 | return usb; |
382 | } | 382 | } |
@@ -660,7 +660,7 @@ int wps_get_touchaction(struct wps_data *data) | |||
660 | return ACTION_REDRAW; | 660 | return ACTION_REDRAW; |
661 | } | 661 | } |
662 | } | 662 | } |
663 | } | 663 | } |
664 | } | 664 | } |
665 | regions = regions->next; | 665 | regions = regions->next; |
666 | } | 666 | } |
@@ -1024,7 +1024,7 @@ long gui_wps_show(void) | |||
1024 | { | 1024 | { |
1025 | gwps_leave_wps(); | 1025 | gwps_leave_wps(); |
1026 | if (quick_screen_quick(button)) | 1026 | if (quick_screen_quick(button)) |
1027 | return SYS_USB_CONNECTED; | 1027 | return GO_TO_ROOT; |
1028 | restore = true; | 1028 | restore = true; |
1029 | } | 1029 | } |
1030 | break; | 1030 | break; |
@@ -1036,7 +1036,7 @@ long gui_wps_show(void) | |||
1036 | { | 1036 | { |
1037 | gwps_leave_wps(); | 1037 | gwps_leave_wps(); |
1038 | if (quick_screen_f3(BUTTON_F3)) | 1038 | if (quick_screen_f3(BUTTON_F3)) |
1039 | return SYS_USB_CONNECTED; | 1039 | return GO_TO_ROOT; |
1040 | restore = true; | 1040 | restore = true; |
1041 | } | 1041 | } |
1042 | break; | 1042 | break; |
@@ -1048,7 +1048,7 @@ long gui_wps_show(void) | |||
1048 | { | 1048 | { |
1049 | gwps_leave_wps(); | 1049 | gwps_leave_wps(); |
1050 | if (1 == gui_syncpitchscreen_run()) | 1050 | if (1 == gui_syncpitchscreen_run()) |
1051 | return SYS_USB_CONNECTED; | 1051 | return GO_TO_ROOT; |
1052 | restore = true; | 1052 | restore = true; |
1053 | } | 1053 | } |
1054 | break; | 1054 | break; |
@@ -1076,7 +1076,8 @@ long gui_wps_show(void) | |||
1076 | case ACTION_WPS_ID3SCREEN: | 1076 | case ACTION_WPS_ID3SCREEN: |
1077 | { | 1077 | { |
1078 | gwps_leave_wps(); | 1078 | gwps_leave_wps(); |
1079 | browse_id3(); | 1079 | if (browse_id3()) |
1080 | return GO_TO_ROOT; | ||
1080 | restore = true; | 1081 | restore = true; |
1081 | } | 1082 | } |
1082 | break; | 1083 | break; |
@@ -1123,12 +1124,15 @@ long gui_wps_show(void) | |||
1123 | case ACTION_WPS_VIEW_PLAYLIST: | 1124 | case ACTION_WPS_VIEW_PLAYLIST: |
1124 | gwps_leave_wps(); | 1125 | gwps_leave_wps(); |
1125 | if (playlist_viewer()) /* true if USB connected */ | 1126 | if (playlist_viewer()) /* true if USB connected */ |
1126 | return SYS_USB_CONNECTED; | 1127 | return GO_TO_ROOT; |
1127 | restore = true; | 1128 | restore = true; |
1128 | break; | 1129 | break; |
1129 | default: | 1130 | default: |
1130 | if(default_event_handler(button) == SYS_USB_CONNECTED) | 1131 | if(default_event_handler(button) == SYS_USB_CONNECTED) |
1132 | { | ||
1133 | gwps_leave_wps(); | ||
1131 | return GO_TO_ROOT; | 1134 | return GO_TO_ROOT; |
1135 | } | ||
1132 | update = true; | 1136 | update = true; |
1133 | break; | 1137 | break; |
1134 | } | 1138 | } |