Browse Source

Merge pull request #2589 from DonLakeFlyer/Mission

Mission changes
QGC4.4
Don Gagne 9 years ago
parent
commit
438cf36832
  1. 4
      src/MissionEditor/MissionEditor.qml
  2. 2
      src/MissionManager/MissionManager.cc

4
src/MissionEditor/MissionEditor.qml

@ -600,7 +600,7 @@ QGCView { @@ -600,7 +600,7 @@ QGCView {
QGCViewMessage {
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() {
hideDialog()
@ -614,7 +614,7 @@ QGCView { @@ -614,7 +614,7 @@ QGCView {
QGCViewMessage {
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() {
hideDialog()

2
src/MissionManager/MissionManager.cc

@ -182,8 +182,8 @@ void MissionManager::_readTransactionComplete(void) @@ -182,8 +182,8 @@ void MissionManager::_readTransactionComplete(void)
_vehicle->sendMessage(message);
emit newMissionItemsAvailable();
_finishTransaction(true);
emit newMissionItemsAvailable();
}
void MissionManager::_handleMissionCount(const mavlink_message_t& message)

Loading…
Cancel
Save