1 files changed, 8 insertions, 3 deletions

diff --git a/apps/wps.c b/apps/wps.c
index a685d58ba0..f05109872d 100644
--- a/apps/wps.c
+++ b/apps/wps.c
@@ -655,28 +655,33 @@ long wps_show(void)
                 break;
 #endif
 
-#if CONFIG_KEYPAD == RECORDER_PAD
+#if (CONFIG_KEYPAD == RECORDER_PAD) || (CONFIG_KEYPAD == IRIVER_H100_PAD)
                 /* play settings */
-            case BUTTON_F2:
-                if (quick_screen(CONTEXT_WPS, BUTTON_F2))
+            case WPS_QUICK:
+                if (quick_screen(CONTEXT_WPS, WPS_QUICK))
                     return SYS_USB_CONNECTED;
                 restore = true;
+                lastbutton = 0;
                 break;
 
                 /* screen settings */
+#ifdef BUTTON_F3
             case BUTTON_F3:
                 if (quick_screen(CONTEXT_WPS, BUTTON_F3))
                     return SYS_USB_CONNECTED;
                 restore = true;
                 break;
+#endif
 
                 /* pitch screen */
+#if CONFIG_KEYPAD == RECORDER_PAD
             case BUTTON_ON | BUTTON_REPEAT:
                 if (2 == pitch_screen())
                     return SYS_USB_CONNECTED;
                 restore = true;
                 break;
 #endif
+#endif
 
                 /* stop and exit wps */
 #ifdef WPS_EXIT