4 files changed, 30 insertions, 23 deletions

diff --git a/apps/menu.h b/apps/menu.h
index 7ebfbf316c..d7cdfbf6d6 100644
--- a/apps/menu.h
+++ b/apps/menu.h
@@ -26,25 +26,25 @@
 #if CONFIG_KEYPAD == RECORDER_PAD
 #define MENU_NEXT   BUTTON_DOWN
 #define MENU_PREV   BUTTON_UP
-#define MENU_EXIT   (BUTTON_LEFT | BUTTON_REL)
-#define MENU_EXIT2  (BUTTON_OFF | BUTTON_REL)
-#define MENU_EXIT3  (BUTTON_F1 | BUTTON_REL)
-#define MENU_ENTER  (BUTTON_RIGHT | BUTTON_REL)
-#define MENU_ENTER2 (BUTTON_PLAY | BUTTON_REL)
+#define MENU_EXIT   BUTTON_LEFT
+#define MENU_EXIT2  BUTTON_OFF
+#define MENU_EXIT3  BUTTON_F1
+#define MENU_ENTER  BUTTON_RIGHT
+#define MENU_ENTER2 BUTTON_PLAY
 
 #elif CONFIG_KEYPAD == PLAYER_PAD
 #define MENU_NEXT  BUTTON_RIGHT
 #define MENU_PREV  BUTTON_LEFT
-#define MENU_EXIT  (BUTTON_STOP | BUTTON_REL)
-#define MENU_EXIT2 (BUTTON_MENU | BUTTON_REL)
-#define MENU_ENTER (BUTTON_PLAY | BUTTON_REL)
+#define MENU_EXIT  BUTTON_STOP
+#define MENU_EXIT2 BUTTON_MENU
+#define MENU_ENTER BUTTON_PLAY
 
 #elif CONFIG_KEYPAD == ONDIO_PAD
 #define MENU_NEXT  BUTTON_DOWN
 #define MENU_PREV  BUTTON_UP
-#define MENU_EXIT  (BUTTON_LEFT | BUTTON_REL)
-#define MENU_EXIT2 (BUTTON_MENU | BUTTON_REL)
-#define MENU_ENTER (BUTTON_RIGHT | BUTTON_REL)
+#define MENU_EXIT  BUTTON_LEFT
+#define MENU_EXIT2 BUTTON_MENU
+#define MENU_ENTER BUTTON_RIGHT
 
 #endif
 
diff --git a/apps/settings.h b/apps/settings.h
index b6d37a0aab..2b86bdd8c7 100644
--- a/apps/settings.h
+++ b/apps/settings.h
@@ -37,24 +37,24 @@
 #if CONFIG_KEYPAD == RECORDER_PAD
 #define SETTINGS_INC     BUTTON_UP
 #define SETTINGS_DEC     BUTTON_DOWN
-#define SETTINGS_OK      (BUTTON_PLAY|BUTTON_REL)
-#define SETTINGS_OK2     (BUTTON_LEFT|BUTTON_REL)
-#define SETTINGS_CANCEL  (BUTTON_OFF|BUTTON_REL)
-#define SETTINGS_CANCEL2 (BUTTON_F1|BUTTON_REL)
+#define SETTINGS_OK      BUTTON_PLAY
+#define SETTINGS_OK2     BUTTON_LEFT
+#define SETTINGS_CANCEL  BUTTON_OFF
+#define SETTINGS_CANCEL2 BUTTON_F1
 
 #elif CONFIG_KEYPAD == PLAYER_PAD
 #define SETTINGS_INC     BUTTON_RIGHT
 #define SETTINGS_DEC     BUTTON_LEFT
-#define SETTINGS_OK      (BUTTON_PLAY|BUTTON_REL)
-#define SETTINGS_CANCEL  (BUTTON_STOP|BUTTON_REL)
-#define SETTINGS_CANCEL2 (BUTTON_MENU|BUTTON_REL)
+#define SETTINGS_OK      BUTTON_PLAY
+#define SETTINGS_CANCEL  BUTTON_STOP
+#define SETTINGS_CANCEL2 BUTTON_MENU
 
 #elif CONFIG_KEYPAD == ONDIO_PAD
 #define SETTINGS_INC    BUTTON_UP
 #define SETTINGS_DEC    BUTTON_DOWN
-#define SETTINGS_OK     (BUTTON_RIGHT|BUTTON_REL)
-#define SETTINGS_OK2    (BUTTON_LEFT|BUTTON_REL)
-#define SETTINGS_CANCEL (BUTTON_MENU|BUTTON_REL)
+#define SETTINGS_OK     BUTTON_RIGHT
+#define SETTINGS_OK2    BUTTON_LEFT
+#define SETTINGS_CANCEL BUTTON_MENU
 
 #endif
 
diff --git a/apps/tree.h b/apps/tree.h
index 398c676f05..4b3406416f 100644
--- a/apps/tree.h
+++ b/apps/tree.h
@@ -27,7 +27,7 @@
 #define TREE_EXIT  BUTTON_LEFT
 #define TREE_ENTER BUTTON_RIGHT
 #define TREE_RUN   BUTTON_PLAY
-#define TREE_MENU  (BUTTON_F1 | BUTTON_REL)
+#define TREE_MENU  BUTTON_F1
 #define TREE_SHIFT BUTTON_ON
 #define TREE_OFF   BUTTON_OFF
 
@@ -43,7 +43,7 @@
 #define TREE_EXIT  BUTTON_STOP
 #define TREE_ENTER BUTTON_PLAY
 #define TREE_RUN   BUTTON_PLAY
-#define TREE_MENU  (BUTTON_MENU | BUTTON_REL)
+#define TREE_MENU  BUTTON_MENU
 #define TREE_SHIFT BUTTON_ON
 
 #define TREE_RC_NEXT  BUTTON_RC_RIGHT
diff --git a/apps/wps.c b/apps/wps.c
index e93b20d141..4a1a6f9b02 100644
--- a/apps/wps.c
+++ b/apps/wps.c
@@ -75,6 +75,7 @@ static char current_track_path[MAX_PATH+1];
 #define WPS_MENU    (BUTTON_F1 | BUTTON_REL)
 #define WPS_MENU_PRE BUTTON_F1
 #define WPS_BROWSE  (BUTTON_ON | BUTTON_REL)
+#define WPS_BROWSE_PRE BUTTON_ON
 #define WPS_EXIT     BUTTON_OFF
 #define WPS_KEYLOCK (BUTTON_F1 | BUTTON_DOWN)
 #define WPS_ID3     (BUTTON_F1 | BUTTON_ON)
@@ -99,6 +100,7 @@ static char current_track_path[MAX_PATH+1];
 #define WPS_MENU    (BUTTON_MENU | BUTTON_REL)
 #define WPS_MENU_PRE BUTTON_MENU
 #define WPS_BROWSE  (BUTTON_ON | BUTTON_REL)
+#define WPS_BROWSE_PRE BUTTON_ON
 #define WPS_EXIT     BUTTON_STOP
 #define WPS_KEYLOCK (BUTTON_MENU | BUTTON_STOP)
 #define WPS_ID3     (BUTTON_MENU | BUTTON_ON)
@@ -122,6 +124,7 @@ static char current_track_path[MAX_PATH+1];
 #define WPS_PAUSE    BUTTON_OFF
 #define WPS_MENU    (BUTTON_MENU | BUTTON_REPEAT)
 #define WPS_BROWSE  (BUTTON_MENU | BUTTON_REL)
+#define WPS_BROWSE_PRE BUTTON_MENU
 #define WPS_KEYLOCK (BUTTON_MENU | BUTTON_DOWN)
 
 #endif
@@ -530,6 +533,10 @@ int wps_show(void)
         switch(button)
         {
             case WPS_BROWSE:
+#ifdef WPS_BROWSE_PRE
+                if (lastbutton != WPS_BROWSE_PRE)
+                    break;
+#endif
 #ifdef HAVE_LCD_CHARCELLS
                 status_set_record(false);
                 status_set_audio(false);