From b0f64aa34e7aa68ca803a9c760d18bb9e2124381 Mon Sep 17 00:00:00 2001
From: Don Gagne <don@thegagnes.com>
Date: Mon, 28 Dec 2015 11:04:32 -0800
Subject: [PATCH 1/2] Ok button not working

---
 src/ui/SettingsDialog.cc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/ui/SettingsDialog.cc b/src/ui/SettingsDialog.cc
index e72ed01..bc57aff 100644
--- a/src/ui/SettingsDialog.cc
+++ b/src/ui/SettingsDialog.cc
@@ -60,6 +60,8 @@ SettingsDialog::SettingsDialog(QWidget *parent, Qt::WindowFlags flags)
     this->window()->setWindowTitle(tr("QGroundControl Settings"));
 
     _ui->tabWidget->setCurrentWidget(pMavsettings);
+
+    connect(_ui->buttonBox, &QDialogButtonBox::accepted, this, &SettingsDialog::accept);
 }
 
 SettingsDialog::~SettingsDialog()

From a52f38e7196ead25b4de20a66f0b4e9b8a26d831 Mon Sep 17 00:00:00 2001
From: Don Gagne <don@thegagnes.com>
Date: Mon, 28 Dec 2015 11:04:59 -0800
Subject: [PATCH 2/2] No communication with vehicle in destructor

At that point the vehicle is gone, so need to to clean it up
---
 src/AutoPilotPlugins/PX4/PowerComponentController.cc | 5 -----
 src/AutoPilotPlugins/PX4/PowerComponentController.h  | 1 -
 2 files changed, 6 deletions(-)

diff --git a/src/AutoPilotPlugins/PX4/PowerComponentController.cc b/src/AutoPilotPlugins/PX4/PowerComponentController.cc
index 604fee7..24dd2fa 100644
--- a/src/AutoPilotPlugins/PX4/PowerComponentController.cc
+++ b/src/AutoPilotPlugins/PX4/PowerComponentController.cc
@@ -36,11 +36,6 @@ PowerComponentController::PowerComponentController(void)
 
 }
 
-PowerComponentController::~PowerComponentController()
-{
-    _stopCalibration();
-}
-
 void PowerComponentController::calibrateEsc(void)
 {
     _warningMessages.clear();
diff --git a/src/AutoPilotPlugins/PX4/PowerComponentController.h b/src/AutoPilotPlugins/PX4/PowerComponentController.h
index 5e608c7..d6a35c9 100644
--- a/src/AutoPilotPlugins/PX4/PowerComponentController.h
+++ b/src/AutoPilotPlugins/PX4/PowerComponentController.h
@@ -40,7 +40,6 @@ class PowerComponentController : public FactPanelController
     
 public:
     PowerComponentController(void);
-    ~PowerComponentController();
     
     Q_INVOKABLE void calibrateEsc(void);
     Q_INVOKABLE void busConfigureActuators(void);