diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2006-11-18 23:39:20 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2006-11-18 23:39:20 +0000 |
| commit | b7cfcffd7a156e19dfa9882d67426f4fa6edef57 (patch) | |
| tree | 563fc081f1060fc6ba2034d271f8039b8ea4aa24 | |
| parent | aac54546a9a22a1d3e650ec9efeb631a461e80c8 (diff) | |
| download | mana-b7cfcffd7a156e19dfa9882d67426f4fa6edef57.tar.gz mana-b7cfcffd7a156e19dfa9882d67426f4fa6edef57.tar.bz2 mana-b7cfcffd7a156e19dfa9882d67426f4fa6edef57.tar.xz mana-b7cfcffd7a156e19dfa9882d67426f4fa6edef57.zip | |
Fixed initialization of joystick enabled checkbox.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | src/gui/setup_joystick.cpp | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,8 @@ +2006-11-19 Bjørn Lindeijer <bjorn@lindeijer.nl> + + * src/gui/setup_joystick.cpp: Fixed joystick option to show enabled + when the joystick is enabled. + 2006-11-17 Björn Steinbrink <B.Steinbrink@gmx.de> * data/graphics/sprites/CMakeLists.txt: Fixed some filenames. diff --git a/src/gui/setup_joystick.cpp b/src/gui/setup_joystick.cpp index d9212728..685d88cf 100644 --- a/src/gui/setup_joystick.cpp +++ b/src/gui/setup_joystick.cpp @@ -42,7 +42,7 @@ Setup_Joystick::Setup_Joystick(): mCalibrateLabel->setPosition(10, 25); mCalibrateButton->setPosition(10, 30 + mCalibrateLabel->getHeight()); - mOriginalJoystickEnabled = (joystick ? joystick->isEnabled() : false); + mOriginalJoystickEnabled = (int)config.getValue("joystickEnabled", 0) != 0; mJoystickEnabled->setMarked(mOriginalJoystickEnabled); mJoystickEnabled->setEventId("joystickEnabled"); |