Commit 6677c9b2 authored by Don Gagne's avatar Don Gagne Committed by GitHub

Merge pull request #5012 from DonLakeFlyer/SomeFixes

Some fixes
parents ec0f0532 bcffae2b
...@@ -110,7 +110,7 @@ void ParameterManager::_parameterUpdate(int vehicleId, int componentId, QString ...@@ -110,7 +110,7 @@ void ParameterManager::_parameterUpdate(int vehicleId, int componentId, QString
// ArduPilot has this strange behavior of streaming parameters that we didn't ask for. This even happens before it responds to the // ArduPilot has this strange behavior of streaming parameters that we didn't ask for. This even happens before it responds to the
// PARAM_REQUEST_LIST. We disregard any of this until the initial request is responded to. // PARAM_REQUEST_LIST. We disregard any of this until the initial request is responded to.
if (parameterId == 65535 && _initialRequestTimeoutTimer.isActive()) { if (parameterId == 65535 && parameterName != "_HASH_CHECK" && _initialRequestTimeoutTimer.isActive()) {
qCDebug(ParameterManagerVerbose1Log) << "Disregarding unrequested param prior to intial list response" << parameterName; qCDebug(ParameterManagerVerbose1Log) << "Disregarding unrequested param prior to intial list response" << parameterName;
return; return;
} }
......
...@@ -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