From 50d01b95fade069a1f987bbc8686385599263a44 Mon Sep 17 00:00:00 2001
From: Michael Carpenter <malcom2073@gmail.com>
Date: Thu, 18 Jul 2013 10:58:52 -0400
Subject: [PATCH] Fix for crash involving improperly setting m_uas to 0 in some
 Config Widgets

---
 src/ui/configuration/AccelCalibrationConfig.cc | 1 -
 src/ui/configuration/AccelCalibrationConfig.h  | 1 -
 src/ui/configuration/CompassConfig.cc          | 1 -
 src/ui/configuration/CompassConfig.h           | 1 -
 src/ui/configuration/FlightModeConfig.h        | 1 -
 src/ui/configuration/FrameTypeConfig.h         | 1 -
 src/ui/configuration/RadioCalibrationConfig.h  | 1 -
 7 files changed, 7 deletions(-)

diff --git a/src/ui/configuration/AccelCalibrationConfig.cc b/src/ui/configuration/AccelCalibrationConfig.cc
index e5d2b7a17..945ba5e2e 100644
--- a/src/ui/configuration/AccelCalibrationConfig.cc
+++ b/src/ui/configuration/AccelCalibrationConfig.cc
@@ -3,7 +3,6 @@
 
 AccelCalibrationConfig::AccelCalibrationConfig(QWidget *parent) : AP2ConfigWidget(parent)
 {
-    m_uas=0;
     ui.setupUi(this);
     connect(ui.calibrateAccelButton,SIGNAL(clicked()),this,SLOT(calibrateButtonClicked()));
 
diff --git a/src/ui/configuration/AccelCalibrationConfig.h b/src/ui/configuration/AccelCalibrationConfig.h
index 69dc2c414..ef6f6e1a1 100644
--- a/src/ui/configuration/AccelCalibrationConfig.h
+++ b/src/ui/configuration/AccelCalibrationConfig.h
@@ -21,7 +21,6 @@ private slots:
 private:
     int m_accelAckCount;
     Ui::AccelCalibrationConfig ui;
-    UASInterface *m_uas;
 };
 
 #endif // ACCELCALIBRATIONCONFIG_H
diff --git a/src/ui/configuration/CompassConfig.cc b/src/ui/configuration/CompassConfig.cc
index 394ffe984..d0cbcc7ad 100644
--- a/src/ui/configuration/CompassConfig.cc
+++ b/src/ui/configuration/CompassConfig.cc
@@ -3,7 +3,6 @@
 
 CompassConfig::CompassConfig(QWidget *parent) : AP2ConfigWidget(parent)
 {
-    m_uas=0;
     ui.setupUi(this);
     ui.autoDecCheckBox->setEnabled(false);
     ui.enableCheckBox->setEnabled(false);
diff --git a/src/ui/configuration/CompassConfig.h b/src/ui/configuration/CompassConfig.h
index fde4bf05e..d650c1beb 100644
--- a/src/ui/configuration/CompassConfig.h
+++ b/src/ui/configuration/CompassConfig.h
@@ -20,7 +20,6 @@ private slots:
     void orientationComboChanged(int index);
 private:
     Ui::CompassConfig ui;
-    UASInterface *m_uas;
 };
 
 #endif // COMPASSCONFIG_H
diff --git a/src/ui/configuration/FlightModeConfig.h b/src/ui/configuration/FlightModeConfig.h
index 8506a5128..373de8560 100644
--- a/src/ui/configuration/FlightModeConfig.h
+++ b/src/ui/configuration/FlightModeConfig.h
@@ -26,7 +26,6 @@ private:
     QMap<int,int> roverModeUiIndexToIndex;
     QMap<int,int> planeModeUiIndexToIndex;
     Ui::FlightModeConfig ui;
-    UASInterface *m_uas;
 };
 
 #endif // FLIGHTMODECONFIG_H
diff --git a/src/ui/configuration/FrameTypeConfig.h b/src/ui/configuration/FrameTypeConfig.h
index fbee2d130..92d04b95c 100644
--- a/src/ui/configuration/FrameTypeConfig.h
+++ b/src/ui/configuration/FrameTypeConfig.h
@@ -52,7 +52,6 @@ private slots:
     void vFrameSelected();
 private:
     Ui::FrameTypeConfig ui;
-    UASInterface *m_uas;
 };
 
 #endif // FRAMETYPECONFIG_H
diff --git a/src/ui/configuration/RadioCalibrationConfig.h b/src/ui/configuration/RadioCalibrationConfig.h
index 8e9eb3007..fb2519863 100644
--- a/src/ui/configuration/RadioCalibrationConfig.h
+++ b/src/ui/configuration/RadioCalibrationConfig.h
@@ -63,7 +63,6 @@ private:
     double rcValue[8];
     QTimer *guiUpdateTimer;
     bool m_calibrationEnabled;
-    UASInterface *m_uas;
     Ui::RadioCalibrationConfig ui;
 };
 
-- 
2.22.0