Prevent Flight Mode setup from crashing

3e2df8f5 · Rustom Jehangir · efc19ab4 · 3e2df8f5
Commit 3e2df8f5 authored Jul 23, 2016 by Rustom Jehangir
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

APMFlightModesComponent.cc src/AutoPilotPlugins/APM/APMFlightModesComponent.cc +4 -2

No files found.
--- 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();