Merge pull request #4539 from DonLakeFlyer/Copter3.5Crash

Prevent crash from missing FRAME param
mavlink · Feb 14, 2017 · 59f8948 · 59f8948
2 parents 4a25648 + d7be080
commit 59f8948
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/AutoPilotPlugins/APM/APMAirframeComponentController.cc b/src/AutoPilotPlugins/APM/APMAirframeComponentController.cc
@@ -39,8 +39,11 @@ APMAirframeComponentController::APMAirframeComponentController(void) :
     _fillAirFrames();
 
     Fact *frame = getParameterFact(FactSystem::defaultComponentId, QStringLiteral("FRAME"));
-    connect(frame, &Fact::vehicleUpdated, this, &APMAirframeComponentController::_factFrameChanged);
-    _factFrameChanged(frame->rawValue());
+    if (frame) {
+        // Not available in newer firmwares, requires newer QGC to run correctly
+        connect(frame, &Fact::vehicleUpdated, this, &APMAirframeComponentController::_factFrameChanged);
+        _factFrameChanged(frame->rawValue());
+    }
 }
 
 APMAirframeComponentController::~APMAirframeComponentController()

diff --git a/src/QGCApplication.cc b/src/QGCApplication.cc
@@ -622,7 +622,7 @@ void QGCApplication::_missingParamsDisplay(void)
     }
     _missingParams.clear();
 
-    showMessage(QString("Parameters missing from firmware: %1. You may be running an older version of firmware QGC does not work correctly with or your firmware has a bug in it.").arg(params));
+    showMessage(QString("Parameters missing from firmware: %1. You may be running a version of firmware QGC does not work correctly with or your firmware has a bug in it.").arg(params));
 }
 
 QObject* QGCApplication::_rootQmlObject()