Commit e06cbb76 authored by DonLakeFlyer's avatar DonLakeFlyer

Resume mission takes precedence over Start mission

parent ec0f0532
...@@ -333,6 +333,8 @@ QGCView { ...@@ -333,6 +333,8 @@ QGCView {
anchors.left: parent.left anchors.left: parent.left
anchors.right: altitudeSlider.visible ? altitudeSlider.left : parent.right anchors.right: altitudeSlider.visible ? altitudeSlider.left : parent.right
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
property var qgcView: root
} }
// Button to start/stop video recording // Button to start/stop video recording
...@@ -514,7 +516,7 @@ QGCView { ...@@ -514,7 +516,7 @@ QGCView {
z: _flightVideoPipControl.z + 1 z: _flightVideoPipControl.z + 1
onShowStartMissionChanged: { onShowStartMissionChanged: {
if (showStartMission) { if (showStartMission && !showResumeMission) {
confirmAction(actionStartMission) confirmAction(actionStartMission)
} }
} }
......
Markdown is supported
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