diff options
author | Jeffrey Goode <jeffg7@gmail.com> | 2010-05-09 02:02:51 +0000 |
---|---|---|
committer | Jeffrey Goode <jeffg7@gmail.com> | 2010-05-09 02:02:51 +0000 |
commit | 1ad76ff25be3f86b9467fc6f4171dbf6895b419c (patch) | |
tree | e679a66806c1a89343a29324dd2a6bc860d4a86d /apps/gui | |
parent | 8d3553489f1dd44b9dd3b7493489e9ec03f387be (diff) | |
download | rockbox-1ad76ff25be3f86b9467fc6f4171dbf6895b419c.tar.gz rockbox-1ad76ff25be3f86b9467fc6f4171dbf6895b419c.zip |
FS#11250: Hotkey setting method changed to menu item vs button pres in context menu. Manuals updated to match.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25905 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui')
-rw-r--r-- | apps/gui/wps.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/apps/gui/wps.c b/apps/gui/wps.c index 916ca2cbcf..96f66eeb50 100644 --- a/apps/gui/wps.c +++ b/apps/gui/wps.c | |||
@@ -886,8 +886,11 @@ long gui_wps_show(void) | |||
886 | #endif | 886 | #endif |
887 | switch(button) | 887 | switch(button) |
888 | { | 888 | { |
889 | case ACTION_WPS_CONTEXT: | ||
890 | case ACTION_WPS_HOTKEY: | 889 | case ACTION_WPS_HOTKEY: |
890 | if (!global_settings.hotkey_wps) | ||
891 | break; | ||
892 | /* fall through */ | ||
893 | case ACTION_WPS_CONTEXT: | ||
891 | { | 894 | { |
892 | bool hotkey = button == ACTION_WPS_HOTKEY; | 895 | bool hotkey = button == ACTION_WPS_HOTKEY; |
893 | gwps_leave_wps(); | 896 | gwps_leave_wps(); |