From e830c29dc4ad1b6233c801438f1665c204b4189c Mon Sep 17 00:00:00 2001
From: Don Gagne <don@thegagnes.com>
Date: Fri, 10 Jun 2016 19:12:49 -0700
Subject: [PATCH] Allow disable of uncalibrated joystick

---
 src/VehicleSetup/JoystickConfig.qml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/VehicleSetup/JoystickConfig.qml b/src/VehicleSetup/JoystickConfig.qml
index 4eeeb8c..cdaa6b2 100644
--- 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