From 593cccb16074fe9269dd2f278bd79859769eb1fd Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 8 Sep 2012 00:17:45 +0300
Subject: Improve constructors in some classes.

---
 src/joystick.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'src/joystick.cpp')

diff --git a/src/joystick.cpp b/src/joystick.cpp
index 04fb9d254..81b61b85d 100644
--- a/src/joystick.cpp
+++ b/src/joystick.cpp
@@ -59,16 +59,12 @@ Joystick::Joystick(int no):
     mLeftTolerance(0),
     mRightTolerance(0),
     mCalibrating(false),
+    mNumber(no >= joystickCount ? joystickCount : no),
     mCalibrated(false),
     mButtonsNumber(MAX_BUTTONS),
     mUseInactive(false),
     mHaveHats(false)
 {
-    if (no >= joystickCount)
-        no = joystickCount;
-
-    mNumber = no;
-
     for (int i = 0; i < MAX_BUTTONS; i++)
         mActiveButtons[i] = false;
 }
-- 
cgit v1.2.3-60-g2f50