Skip to content

Q
qgroundcontrol
Commit 25f07898 authored by Don Gagne's avatar Don Gagne
Browse files
Options

Tweak signaling to pop Start Mission on new mission upload

parent cb69cc82
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
src/MissionManager/MissionController.cc
View file @ 25f07898
...@@ -170,6 +170,8 @@ void MissionController::_newMissionItemsAvailableFromVehicle(bool removeAllReque ...@@ -170,6 +170,8 @@ void MissionController::_newMissionItemsAvailableFromVehicle(bool removeAllReque
_deinitAllVisualItems(); _deinitAllVisualItems();
_visualItems->deleteLater(); _visualItems->deleteLater();
_settingsItem = NULL; _settingsItem = NULL;
_visualItems = NULL;
_updateContainsItems(); // This will clear containsItems which will be set again below. This will re-pop Start Mission confirmation.
_visualItems = newControllerMissionItems; _visualItems = newControllerMissionItems;
if (!_controllerVehicle->firmwarePlugin()->sendHomePositionToVehicle() || _visualItems->count() == 0) { if (!_controllerVehicle->firmwarePlugin()->sendHomePositionToVehicle() || _visualItems->count() == 0) {
...@@ -181,6 +183,7 @@ void MissionController::_newMissionItemsAvailableFromVehicle(bool removeAllReque ...@@ -181,6 +183,7 @@ void MissionController::_newMissionItemsAvailableFromVehicle(bool removeAllReque
} }
_initAllVisualItems(); _initAllVisualItems();
_updateContainsItems();
emit newItemsFromVehicle(); emit newItemsFromVehicle();
} }
_itemsRequested = false; _itemsRequested = false;
......
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