Merge pull request #3526 from DonLakeFlyer/AllowDisable

Allow disable of uncalibrated joystick

Merge pull request #3526 from DonLakeFlyer/AllowDisable
Allow disable of uncalibrated joystick
50650ec8 · Don Gagne · GitHub · 99db0a0c · e830c29d · 50650ec8
Commit 50650ec8 authored Jun 10, 2016 by Don Gagne Committed by GitHub Jun 10, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

JoystickConfig.qml src/VehicleSetup/JoystickConfig.qml +2 -2

No files found.
--- a/src/VehicleSetup/JoystickConfig.qml
+++ b/src/VehicleSetup/JoystickConfig.qml
@@ -343,8 +343,8 @@ QGCView {


                        QGCCheckBox {
-                            enabled:    _activeJoystick.calibrated
-                            text:       _activeJoystick.calibrated ? qsTr("Enable joystick input") : qsTr("Enable/Disable not allowed (Calibrate First)")
+                            enabled:    checked || _activeJoystick.calibrated
+                            text:       _activeJoystick.calibrated ? qsTr("Enable joystick input") : qsTr("Enable not allowed (Calibrate First)")
                            checked:    _activeVehicle.joystickEnabled

                            onClicked:  _activeVehicle.joystickEnabled = checked