summaryrefslogtreecommitdiff
path: root/src/gui/widgets/tabs/setup_joystick.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-10-11 17:35:24 +0300
committerAndrei Karas <akaras@inbox.ru>2013-10-11 18:00:22 +0300
commit52c7195a8ee91f95ef134d9798a47ea313df16c8 (patch)
treeca1f32cfadce611a1820b50f5386c02cd2ce06ae /src/gui/widgets/tabs/setup_joystick.cpp
parentf1b82c1b06604c2c1eed750a6c980aa0b5355560 (diff)
downloadmanaverse-52c7195a8ee91f95ef134d9798a47ea313df16c8.tar.gz
manaverse-52c7195a8ee91f95ef134d9798a47ea313df16c8.tar.bz2
manaverse-52c7195a8ee91f95ef134d9798a47ea313df16c8.tar.xz
manaverse-52c7195a8ee91f95ef134d9798a47ea313df16c8.zip
Second part of checks from Parasoft C++ Test.
Diffstat (limited to 'src/gui/widgets/tabs/setup_joystick.cpp')
-rw-r--r--src/gui/widgets/tabs/setup_joystick.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/gui/widgets/tabs/setup_joystick.cpp b/src/gui/widgets/tabs/setup_joystick.cpp
index 15b6959a9..571d53b6f 100644
--- a/src/gui/widgets/tabs/setup_joystick.cpp
+++ b/src/gui/widgets/tabs/setup_joystick.cpp
@@ -178,10 +178,8 @@ void Setup_Joystick::apply()
if (!joystick)
return;
- config.setValue("joystickEnabled",
- joystick ? joystick->isEnabled() : false);
+ config.setValue("joystickEnabled", joystick->isEnabled());
config.setValue("useInactiveJoystick", mUseInactiveCheckBox->isSelected());
- if (joystick)
- joystick->setUseInactive(mUseInactiveCheckBox->isSelected());
+ joystick->setUseInactive(mUseInactiveCheckBox->isSelected());
}