Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
50d01b95
Commit
50d01b95
authored
Jul 18, 2013
by
Michael Carpenter
Browse files
Fix for crash involving improperly setting m_uas to 0 in some Config Widgets
parent
31a118ce
Changes
7
Show whitespace changes
Inline
Side-by-side
src/ui/configuration/AccelCalibrationConfig.cc
View file @
50d01b95
...
...
@@ -3,7 +3,6 @@
AccelCalibrationConfig
::
AccelCalibrationConfig
(
QWidget
*
parent
)
:
AP2ConfigWidget
(
parent
)
{
m_uas
=
0
;
ui
.
setupUi
(
this
);
connect
(
ui
.
calibrateAccelButton
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
calibrateButtonClicked
()));
...
...
src/ui/configuration/AccelCalibrationConfig.h
View file @
50d01b95
...
...
@@ -21,7 +21,6 @@ private slots:
private:
int
m_accelAckCount
;
Ui
::
AccelCalibrationConfig
ui
;
UASInterface
*
m_uas
;
};
#endif // ACCELCALIBRATIONCONFIG_H
src/ui/configuration/CompassConfig.cc
View file @
50d01b95
...
...
@@ -3,7 +3,6 @@
CompassConfig
::
CompassConfig
(
QWidget
*
parent
)
:
AP2ConfigWidget
(
parent
)
{
m_uas
=
0
;
ui
.
setupUi
(
this
);
ui
.
autoDecCheckBox
->
setEnabled
(
false
);
ui
.
enableCheckBox
->
setEnabled
(
false
);
...
...
src/ui/configuration/CompassConfig.h
View file @
50d01b95
...
...
@@ -20,7 +20,6 @@ private slots:
void
orientationComboChanged
(
int
index
);
private:
Ui
::
CompassConfig
ui
;
UASInterface
*
m_uas
;
};
#endif // COMPASSCONFIG_H
src/ui/configuration/FlightModeConfig.h
View file @
50d01b95
...
...
@@ -26,7 +26,6 @@ private:
QMap
<
int
,
int
>
roverModeUiIndexToIndex
;
QMap
<
int
,
int
>
planeModeUiIndexToIndex
;
Ui
::
FlightModeConfig
ui
;
UASInterface
*
m_uas
;
};
#endif // FLIGHTMODECONFIG_H
src/ui/configuration/FrameTypeConfig.h
View file @
50d01b95
...
...
@@ -52,7 +52,6 @@ private slots:
void
vFrameSelected
();
private:
Ui
::
FrameTypeConfig
ui
;
UASInterface
*
m_uas
;
};
#endif // FRAMETYPECONFIG_H
src/ui/configuration/RadioCalibrationConfig.h
View file @
50d01b95
...
...
@@ -63,7 +63,6 @@ private:
double
rcValue
[
8
];
QTimer
*
guiUpdateTimer
;
bool
m_calibrationEnabled
;
UASInterface
*
m_uas
;
Ui
::
RadioCalibrationConfig
ui
;
};
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment