diff options
Diffstat (limited to 'apps/gui')
-rw-r--r-- | apps/gui/quickscreen.c | 4 | ||||
-rw-r--r-- | apps/gui/quickscreen.h | 2 | ||||
-rw-r--r-- | apps/gui/wps.c | 7 |
3 files changed, 9 insertions, 4 deletions
diff --git a/apps/gui/quickscreen.c b/apps/gui/quickscreen.c index b5113df8f6..f1c95ffef2 100644 --- a/apps/gui/quickscreen.c +++ b/apps/gui/quickscreen.c | |||
@@ -398,7 +398,7 @@ static const struct settings_list *get_setting(int gs_value, | |||
398 | return defaultval; | 398 | return defaultval; |
399 | } | 399 | } |
400 | 400 | ||
401 | bool quick_screen_quick(int button_enter) | 401 | int quick_screen_quick(int button_enter) |
402 | { | 402 | { |
403 | struct gui_quickscreen qs; | 403 | struct gui_quickscreen qs; |
404 | bool oldshuffle = global_settings.playlist_shuffle; | 404 | bool oldshuffle = global_settings.playlist_shuffle; |
@@ -439,7 +439,7 @@ bool quick_screen_quick(int button_enter) | |||
439 | playlist_sort(NULL, true); | 439 | playlist_sort(NULL, true); |
440 | } | 440 | } |
441 | } | 441 | } |
442 | return usb; | 442 | return (usb ? 1:0); |
443 | } | 443 | } |
444 | 444 | ||
445 | /* stuff to make the quickscreen configurable */ | 445 | /* stuff to make the quickscreen configurable */ |
diff --git a/apps/gui/quickscreen.h b/apps/gui/quickscreen.h index acce5cf9bf..015928ee8a 100644 --- a/apps/gui/quickscreen.h +++ b/apps/gui/quickscreen.h | |||
@@ -43,7 +43,7 @@ struct gui_quickscreen | |||
43 | item is changed */ | 43 | item is changed */ |
44 | }; | 44 | }; |
45 | 45 | ||
46 | extern bool quick_screen_quick(int button_enter); | 46 | extern int quick_screen_quick(int button_enter); |
47 | int quickscreen_set_option(void *data); | 47 | int quickscreen_set_option(void *data); |
48 | bool is_setting_quickscreenable(const struct settings_list *setting); | 48 | bool is_setting_quickscreenable(const struct settings_list *setting); |
49 | void set_as_qs_item(const struct settings_list *setting, | 49 | void set_as_qs_item(const struct settings_list *setting, |
diff --git a/apps/gui/wps.c b/apps/gui/wps.c index 846c952baf..78ab8dc8dd 100644 --- a/apps/gui/wps.c +++ b/apps/gui/wps.c | |||
@@ -836,7 +836,12 @@ long gui_wps_show(void) | |||
836 | case ACTION_WPS_QUICKSCREEN: | 836 | case ACTION_WPS_QUICKSCREEN: |
837 | { | 837 | { |
838 | gwps_leave_wps(); | 838 | gwps_leave_wps(); |
839 | if (quick_screen_quick(button)) | 839 | if (global_settings.shortcuts_replaces_qs) |
840 | { | ||
841 | global_status.last_screen = GO_TO_SHORTCUTMENU; | ||
842 | return quick_screen_quick(button); | ||
843 | } | ||
844 | else if (quick_screen_quick(button) > 0) | ||
840 | return GO_TO_ROOT; | 845 | return GO_TO_ROOT; |
841 | restore = true; | 846 | restore = true; |
842 | } | 847 | } |