Merge pull request #2485 from DonLakeFlyer/PowerComponent

Power component shutdown

src/AutoPilotPlugins/PX4/PowerComponentController.cc

@@ -36,11 +36,6 @@ PowerComponentController::PowerComponentController(void)
 
 }
 
-PowerComponentController::~PowerComponentController()
-{
-    _stopCalibration();
-}
-
 void PowerComponentController::calibrateEsc(void)
 {
     _warningMessages.clear();

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);

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()