Merge remote-tracking branch 'Mavlink/master' into iosAppStore

* Mavlink/master: Fix github json download failure argument string
9 years ago · f9d6c73665
1 changed files with 1 additions and 1 deletions
--- a/src/AutoPilotPlugins/APM/APMAirframeComponentController.cc
+++ b/src/AutoPilotPlugins/APM/APMAirframeComponentController.cc
@ -231,7 +231,7 @@ void APMAirframeComponentController::_githubJsonDownloadFinished(QString remoteF
				@@ -231,7 +231,7 @@ void APMAirframeComponentController::_githubJsonDownloadFinished(QString remoteF

 void APMAirframeComponentController::_githubJsonDownloadError(QString errorMsg)
 {
-    qgcApp()->showMessage(tr("Param file github json download failed: % 1").arg(errorMsg));
+    qgcApp()->showMessage(tr("Param file github json download failed: %1").arg(errorMsg));
    qgcApp()->restoreOverrideCursor();
 }