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
2010-05-09 02:02:51 +00:00 · 2010-05-09 02:02:51 +00:00 · 1ad76ff25b
commit 1ad76ff25b
parent 8d3553489f
21 changed files with 140 additions and 571 deletions
--- a/apps/gui/wps.c
+++ b/apps/gui/wps.c
@ -886,8 +886,11 @@ long gui_wps_show(void)
 #endif
        switch(button)
        {
-            case ACTION_WPS_CONTEXT:
            case ACTION_WPS_HOTKEY:
+                if (!global_settings.hotkey_wps)
+                    break;
+                /* fall through */
+            case ACTION_WPS_CONTEXT:
            {
                bool hotkey = button == ACTION_WPS_HOTKEY;
                gwps_leave_wps();