From 08ee315237676ccfeea6d14cce102ffa3488e79c Mon Sep 17 00:00:00 2001
From: Don Gagne <don@thegagnes.com>
Date: Wed, 2 Sep 2015 18:05:23 -0700
Subject: [PATCH] Add null check

---
 src/VehicleSetup/SetupView.qml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/VehicleSetup/SetupView.qml b/src/VehicleSetup/SetupView.qml
index 05c6ad64f..bdb22a292 100644
--- a/src/VehicleSetup/SetupView.qml
+++ b/src/VehicleSetup/SetupView.qml
@@ -184,7 +184,7 @@ Rectangle {
             id:             joystickButton
             width:          buttonWidth
             setupIndicator: true
-            setupComplete:  joystickManager.activeJoystick.calibrated
+            setupComplete:  joystickManager.activeJoystick ? joystickManager.activeJoystick.calibrated : false
             exclusiveGroup: setupButtonGroup
             visible:        multiVehicleManager.parameterReadyVehicleAvailable && joystickManager.joysticks.length != 0
             text:           "JOYSTICK"
-- 
2.22.0