Commit 438cf368 authored by Don Gagne's avatar Don Gagne

Merge pull request #2589 from DonLakeFlyer/Mission

Mission changes
parents 70b593b3 04097cb9
...@@ -600,7 +600,7 @@ QGCView { ...@@ -600,7 +600,7 @@ QGCView {
QGCViewMessage { QGCViewMessage {
id: syncLoadFromVehicleCheck id: syncLoadFromVehicleCheck
message: "Load vehicle check" message: "You have unsaved/unsent mission changes. Loading the mission from the Vehicle will lose these changes. Are you sure you want to load the mission from the Vehicle?"
function accept() { function accept() {
hideDialog() hideDialog()
...@@ -614,7 +614,7 @@ QGCView { ...@@ -614,7 +614,7 @@ QGCView {
QGCViewMessage { QGCViewMessage {
id: syncLoadFromVehicleCheck id: syncLoadFromVehicleCheck
message: "Load file check" message: "You have unsaved/unsent mission changes. Loading a mission from a file will lose these changes. Are you sure you want to load a mission from a file?"
function accept() { function accept() {
hideDialog() hideDialog()
......
...@@ -182,8 +182,8 @@ void MissionManager::_readTransactionComplete(void) ...@@ -182,8 +182,8 @@ void MissionManager::_readTransactionComplete(void)
_vehicle->sendMessage(message); _vehicle->sendMessage(message);
emit newMissionItemsAvailable();
_finishTransaction(true); _finishTransaction(true);
emit newMissionItemsAvailable();
} }
void MissionManager::_handleMissionCount(const mavlink_message_t& message) void MissionManager::_handleMissionCount(const mavlink_message_t& message)
......
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