From 43f4c3708e509e6172dc0d0ff5ba5b8d8dc44419 Mon Sep 17 00:00:00 2001
From: Lorenz Meier <lm@inf.ethz.ch>
Date: Mon, 23 Jun 2014 14:58:11 +0200
Subject: [PATCH] Make RC config more robust

---
 src/ui/QGCPX4VehicleConfig.cc | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/ui/QGCPX4VehicleConfig.cc b/src/ui/QGCPX4VehicleConfig.cc
index 0268b9c7d..1aa427af5 100644
--- a/src/ui/QGCPX4VehicleConfig.cc
+++ b/src/ui/QGCPX4VehicleConfig.cc
@@ -660,14 +660,12 @@ void QGCPX4VehicleConfig::stopCalibrationRC()
     mav->endRadioControlCalibration();
 
     if (QMessageBox::Cancel == msgBoxResult) {
+        QMessageBox::information(0,"Aborting Calibration","Aborted writing configuration.");
         return; //don't commit these values
     } else {
         QMessageBox::information(0,"Uploading the RC Calibration","The configuration will now be uploaded and permanently stored.");
         writeCalibrationRC();
     }
-
-    // Read calibration back to update widget states and validate
-    paramMgr->requestParameterList();
 }
 
 void QGCPX4VehicleConfig::loadQgcConfig(bool primary)
@@ -1338,7 +1336,7 @@ void QGCPX4VehicleConfig::writeCalibrationRC()
     paramMgr->setPendingParam(0, "RC_MAP_AUX2", (int32_t)(rcMapping[10]+1));
 
     //let the param mgr manage sending all the pending RC_foo updates and persisting after
-    paramMgr->sendPendingParameters(true);
+    paramMgr->sendPendingParameters(true, true);
 
 }
 
-- 
2.22.0