From 4423a07e33a2196e05abb08b2529df454016a85b Mon Sep 17 00:00:00 2001
From: Don Gagne <don@thegagnes.com>
Date: Sat, 11 Jun 2016 11:19:21 -0700
Subject: [PATCH] Joystick can't be enabled if no joysticks connected

---
 src/Joystick/JoystickManager.h | 2 --
 src/Vehicle/Vehicle.cc         | 5 ++++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Joystick/JoystickManager.h b/src/Joystick/JoystickManager.h
index 96f22f80b..26cf0093f 100644
--- a/src/Joystick/JoystickManager.h
+++ b/src/Joystick/JoystickManager.h
@@ -20,8 +20,6 @@
 
 Q_DECLARE_LOGGING_CATEGORY(JoystickManagerLog)
 
-class QGCApplicaiton;
-
 class JoystickManager : public QGCTool
 {
     Q_OBJECT
diff --git a/src/Vehicle/Vehicle.cc b/src/Vehicle/Vehicle.cc
index b9fdaec03..64fd84839 100644
--- a/src/Vehicle/Vehicle.cc
+++ b/src/Vehicle/Vehicle.cc
@@ -1057,7 +1057,10 @@ void Vehicle::_loadSettings(void)
         _joystickMode = JoystickModeRC;
     }
 
-    _joystickEnabled = settings.value(_joystickEnabledSettingsKey, false).toBool();
+    // 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)
-- 
2.22.0