From 3e2df8f565e0f192e078e9f66fb4c329ecc87741 Mon Sep 17 00:00:00 2001
From: Rustom Jehangir <rustyj110@gmail.com>
Date: Sat, 23 Jul 2016 17:22:16 -0700
Subject: [PATCH] Prevent Flight Mode setup from crashing

---
 src/AutoPilotPlugins/APM/APMFlightModesComponent.cc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/AutoPilotPlugins/APM/APMFlightModesComponent.cc b/src/AutoPilotPlugins/APM/APMFlightModesComponent.cc
index d79626a34..7229a8ad9 100644
--- a/src/AutoPilotPlugins/APM/APMFlightModesComponent.cc
+++ b/src/AutoPilotPlugins/APM/APMFlightModesComponent.cc
@@ -66,8 +66,10 @@ QString APMFlightModesComponent::prerequisiteSetup(void) const
 
     if (!plugin->airframeComponent()->setupComplete()) {
         return plugin->airframeComponent()->name();
-    } else if (!plugin->radioComponent()->setupComplete()) {
-        return plugin->radioComponent()->name();
+    } else if (plugin->radioComponent() != NULL) {
+        if (!plugin->radioComponent()->setupComplete()) {
+            return plugin->radioComponent()->name();
+        }
     }
     
     return QString();
-- 
2.22.0