From: Tobias Markus <tobbi@mozilla-uk.org>
Date: Sun, 1 Mar 2015 21:36:25 +0000 (+0100)
Subject: Possible fix for expression that's always false
X-Git-Url: https://git.octo.it/?p=supertux.git;a=commitdiff_plain;h=313702b84f43dc98bbeea32a2261e408533dbf58

Possible fix for expression that's always false
---

diff --git a/src/supertux/menu/joystick_menu.cpp b/src/supertux/menu/joystick_menu.cpp
index bd11c9aef..adde0c5c8 100644
--- a/src/supertux/menu/joystick_menu.cpp
+++ b/src/supertux/menu/joystick_menu.cpp
@@ -163,9 +163,9 @@ JoystickMenu::refresh_menu_item(Controller::Control id)
       name << "X";
     else if (abs(axis) == 2)
       name << "Y";
-    else if (abs(axis) == 2)
-      name << "X2";
     else if (abs(axis) == 3)
+      name << "X2";
+    else if (abs(axis) == 4)
       name << "Y2";
     else
       name << abs(axis);