From: Holger Schemel <info@artsoft.org>
Date: Mon, 17 Jul 2017 20:32:10 +0000 (+0200)
Subject: fixed accidentally starting joystick calibration by moving joystick axis
X-Git-Tag: 4.0.1.0~22
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=819b52d40a92b8b83b13cf31185744d433b69e14;p=rocksndiamonds.git

fixed accidentally starting joystick calibration by moving joystick axis
---

diff --git a/src/screens.c b/src/screens.c
index d9abbb6f..b3d9111d 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -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)