Fix issue reported in

f27cdb4543\#commitcomment-24611141, simplify 56e54cd110

source/config.c

@@ -284,11 +284,9 @@ void configMenu(bool oldPinStatus, u32 oldPinMode)
         u32 pressed;
         do
         {
-            pressed = waitInput(true);
+            pressed = waitInput(true) & MENU_BUTTONS;
         }
-        while(!(pressed & MENU_BUTTONS));
-
-        pressed &= MENU_BUTTONS;
+        while(!pressed);
 
         if(pressed == BUTTON_START) break;
 

source/fs.c

@@ -204,11 +204,9 @@ bool payloadMenu(char *path)
         {
             do
             {
-                pressed = waitInput(true);
+                pressed = waitInput(true) & MENU_BUTTONS;
             }
-            while(!(pressed & MENU_BUTTONS));
-
-            pressed &= MENU_BUTTONS;
+            while(!pressed);
 
             u32 oldSelectedPayload = selectedPayload;