From 7c250d50d1174aac7e3f923055de9a281fbbad9c Mon Sep 17 00:00:00 2001 From: Rustom Jehangir Date: Mon, 25 Jul 2016 11:14:03 -0700 Subject: [PATCH] Fix persistency of joystickEnable setting --- src/Vehicle/Vehicle.cc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Vehicle/Vehicle.cc b/src/Vehicle/Vehicle.cc index dae78daaa..c02398310 100644 --- a/src/Vehicle/Vehicle.cc +++ b/src/Vehicle/Vehicle.cc @@ -1119,7 +1119,12 @@ void Vehicle::_saveSettings(void) settings.beginGroup(QString(_settingsGroup).arg(_id)); settings.setValue(_joystickModeSettingsKey, _joystickMode); - settings.setValue(_joystickEnabledSettingsKey, _joystickEnabled); + + // The joystick enabled setting should only be changed if a joystick is present + // since the checkbox can only be clicked if one is present + if (qgcApp()->toolbox()->joystickManager()->joysticks().count()) { + settings.setValue(_joystickEnabledSettingsKey, _joystickEnabled); + } } int Vehicle::joystickMode(void) -- 2.22.0