Commit 50d01b95 authored by Michael Carpenter's avatar Michael Carpenter
Browse files

Fix for crash involving improperly setting m_uas to 0 in some Config Widgets

parent 31a118ce
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
AccelCalibrationConfig::AccelCalibrationConfig(QWidget *parent) : AP2ConfigWidget(parent) AccelCalibrationConfig::AccelCalibrationConfig(QWidget *parent) : AP2ConfigWidget(parent)
{ {
m_uas=0;
ui.setupUi(this); ui.setupUi(this);
connect(ui.calibrateAccelButton,SIGNAL(clicked()),this,SLOT(calibrateButtonClicked())); connect(ui.calibrateAccelButton,SIGNAL(clicked()),this,SLOT(calibrateButtonClicked()));
......
...@@ -21,7 +21,6 @@ private slots: ...@@ -21,7 +21,6 @@ private slots:
private: private:
int m_accelAckCount; int m_accelAckCount;
Ui::AccelCalibrationConfig ui; Ui::AccelCalibrationConfig ui;
UASInterface *m_uas;
}; };
#endif // ACCELCALIBRATIONCONFIG_H #endif // ACCELCALIBRATIONCONFIG_H
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
CompassConfig::CompassConfig(QWidget *parent) : AP2ConfigWidget(parent) CompassConfig::CompassConfig(QWidget *parent) : AP2ConfigWidget(parent)
{ {
m_uas=0;
ui.setupUi(this); ui.setupUi(this);
ui.autoDecCheckBox->setEnabled(false); ui.autoDecCheckBox->setEnabled(false);
ui.enableCheckBox->setEnabled(false); ui.enableCheckBox->setEnabled(false);
......
...@@ -20,7 +20,6 @@ private slots: ...@@ -20,7 +20,6 @@ private slots:
void orientationComboChanged(int index); void orientationComboChanged(int index);
private: private:
Ui::CompassConfig ui; Ui::CompassConfig ui;
UASInterface *m_uas;
}; };
#endif // COMPASSCONFIG_H #endif // COMPASSCONFIG_H
...@@ -26,7 +26,6 @@ private: ...@@ -26,7 +26,6 @@ private:
QMap<int,int> roverModeUiIndexToIndex; QMap<int,int> roverModeUiIndexToIndex;
QMap<int,int> planeModeUiIndexToIndex; QMap<int,int> planeModeUiIndexToIndex;
Ui::FlightModeConfig ui; Ui::FlightModeConfig ui;
UASInterface *m_uas;
}; };
#endif // FLIGHTMODECONFIG_H #endif // FLIGHTMODECONFIG_H
...@@ -52,7 +52,6 @@ private slots: ...@@ -52,7 +52,6 @@ private slots:
void vFrameSelected(); void vFrameSelected();
private: private:
Ui::FrameTypeConfig ui; Ui::FrameTypeConfig ui;
UASInterface *m_uas;
}; };
#endif // FRAMETYPECONFIG_H #endif // FRAMETYPECONFIG_H
...@@ -63,7 +63,6 @@ private: ...@@ -63,7 +63,6 @@ private:
double rcValue[8]; double rcValue[8];
QTimer *guiUpdateTimer; QTimer *guiUpdateTimer;
bool m_calibrationEnabled; bool m_calibrationEnabled;
UASInterface *m_uas;
Ui::RadioCalibrationConfig ui; Ui::RadioCalibrationConfig ui;
}; };
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment