fixed accidentally starting joystick calibration by moving joystick axis
authorHolger Schemel <info@artsoft.org>
Mon, 17 Jul 2017 20:32:10 +0000 (22:32 +0200)
committerHolger Schemel <info@artsoft.org>
Mon, 17 Jul 2017 20:32:10 +0000 (22:32 +0200)
src/screens.c

index d9abbb6f5b822b4ed7b99dad6d95dbea52c001b3..b3d9111d7bd8359997ebdfa2d433fe78ebf37bf6 100644 (file)
@@ -5443,7 +5443,7 @@ static struct TokenInfo setup_info_input[] =
 {
   { TYPE_SWITCH,       NULL,                   "Player:"               },
   { TYPE_SWITCH,       NULL,                   "Device:"               },
-  { TYPE_ENTER_MENU,   NULL,                   ""                      },
+  { TYPE_SWITCH,       NULL,                   ""                      },
   { TYPE_EMPTY,                NULL,                   ""                      },
   { TYPE_EMPTY,                NULL,                   ""                      },
   { TYPE_EMPTY,                NULL,                   ""                      },
@@ -6131,7 +6131,6 @@ void HandleSetupScreen_Input(int mx, int my, int dx, int dy, int button)
     if (dx && choice == 0)
       x = (dx < 0 ? 10 : 12);
     else if ((dx && choice == 1) ||
-            (dx == +1 && choice == 2) ||
             (dx == -1 && choice == pos_end))
       button = MB_MENU_CHOICE;
     else if (dy)