2 files changed, 14 insertions, 2 deletions

diff --git a/apps/gui/gwps.c b/apps/gui/gwps.c
index ea97e61d03..7c9bbc63d2 100644
--- a/apps/gui/gwps.c
+++ b/apps/gui/gwps.c
@@ -369,7 +369,8 @@ long gui_wps_show(void)
             case WPS_FFWD:
                 if (global_settings.party_mode)
                     break;
-#ifdef WPS_NEXT_DIR
+
+#ifdef HAVE_DIR_NAVIGATION
                 if (current_tick - right_lastclick < HZ)
                 {
                     audio_next_dir();
@@ -377,13 +378,15 @@ long gui_wps_show(void)
                     break;
                 }
 #endif
+
 #ifdef WPS_RC_REW
             case WPS_RC_REW:
 #endif
             case WPS_REW:
                 if (global_settings.party_mode)
                     break;
-#ifdef WPS_PREV_DIR
+
+#ifdef HAVE_DIR_NAVIGATION
                 if (current_tick - left_lastclick < HZ)
                 {
                     audio_prev_dir();
@@ -391,6 +394,7 @@ long gui_wps_show(void)
                     break;
                 }
 #endif
+
                 ffwd_rew(button);
                 break;
 
diff --git a/apps/gui/gwps.h b/apps/gui/gwps.h
index 0c170f1a7e..08299acbfc 100644
--- a/apps/gui/gwps.h
+++ b/apps/gui/gwps.h
@@ -75,6 +75,8 @@
 #define WPS_AB_RESET_AB_MARKERS (BUTTON_ON | BUTTON_SELECT)
 #endif
 
+#define HAVE_DIR_NAVIGATION
+
 #elif CONFIG_KEYPAD == RECORDER_PAD
 #define WPS_NEXT       (BUTTON_RIGHT | BUTTON_REL)
 #define WPS_NEXT_PRE   BUTTON_RIGHT
@@ -207,6 +209,8 @@
 #define WPS_AB_RESET_AB_MARKERS (BUTTON_LEFT | BUTTON_RIGHT)
 #endif
 
+#define HAVE_DIR_NAVIGATION
+
 #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD
 
 /* TODO: Check WPS button assignments */
@@ -247,6 +251,8 @@
 #define WPS_CONTEXT    (BUTTON_SELECT | BUTTON_REPEAT)
 #define WPS_QUICK      (BUTTON_REC | BUTTON_REPEAT)
 
+#define HAVE_DIR_NAVIGATION
+
 #elif CONFIG_KEYPAD == GIGABEAT_PAD
 
 #define WPS_NEXT       (BUTTON_RIGHT | BUTTON_REL)
@@ -270,6 +276,8 @@
 #define WPS_NEXT_DIR   (BUTTON_RIGHT | BUTTON_POWER)
 #define WPS_PREV_DIR   (BUTTON_LEFT | BUTTON_POWER)
 
+#define HAVE_DIR_NAVIGATION
+
 #endif
 
 /* constants used in line_type and as refresh_mode for wps_refresh */