Unverified Commit a6d15868 authored by Don Gagne's avatar Don Gagne Committed by GitHub

Merge pull request #8338 from DonLakeFlyer/CommandQ

Fix placement of Vehicle::_sendNextQueuedMavCommand
parents 806b2f1b 5e17a23b
......@@ -3469,6 +3469,7 @@ void Vehicle::_handleCommandAck(mavlink_message_t& message)
_mavCommandAckTimer.stop();
showError = _mavCommandQueue[0].showError;
_mavCommandQueue.removeFirst();
_sendNextQueuedMavCommand();
}
emit mavCommandResult(_id, message.compid, ack.command, ack.result, false /* noResponsefromVehicle */);
......@@ -3493,8 +3494,6 @@ void Vehicle::_handleCommandAck(mavlink_message_t& message)
break;
}
}
_sendNextQueuedMavCommand();
}
void Vehicle::setPrearmError(const QString& prearmError)
......
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