Browse Source

Joystick can't be enabled if no joysticks connected

QGC4.4
Don Gagne 9 years ago
parent
commit
4423a07e33
  1. 2
      src/Joystick/JoystickManager.h
  2. 3
      src/Vehicle/Vehicle.cc

2
src/Joystick/JoystickManager.h

@ -20,8 +20,6 @@ @@ -20,8 +20,6 @@
Q_DECLARE_LOGGING_CATEGORY(JoystickManagerLog)
class QGCApplicaiton;
class JoystickManager : public QGCTool
{
Q_OBJECT

3
src/Vehicle/Vehicle.cc

@ -1057,7 +1057,10 @@ void Vehicle::_loadSettings(void) @@ -1057,7 +1057,10 @@ void Vehicle::_loadSettings(void)
_joystickMode = JoystickModeRC;
}
// Joystick enabled is a global setting so first make sure there are any joysticks connected
if (qgcApp()->toolbox()->joystickManager()->joysticks().count()) {
_joystickEnabled = settings.value(_joystickEnabledSettingsKey, false).toBool();
}
}
void Vehicle::_saveSettings(void)

Loading…
Cancel
Save