Skip to content

Q
qgroundcontrol
Commit 03b36370 authored by Don Gagne's avatar Don Gagne Committed by GitHub
Browse files
Options

Merge pull request #5496 from DonLakeFlyer/StableMerge 

Stable merge
parents 1077c75d 3ea4a28d
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
src/MissionManager/MissionController.cc
View file @ 03b36370
...@@ -1372,7 +1372,7 @@ void MissionController::_initAllVisualItems(void) ...@@ -1372,7 +1372,7 @@ void MissionController::_initAllVisualItems(void)
_settingsItem->setIsCurrentItem(true); _settingsItem->setIsCurrentItem(true);
} }
if (!_editMode && _managerVehicle->homePosition().isValid()) { if (_managerVehicle->homePosition().isValid()) {
_settingsItem->setCoordinate(_managerVehicle->homePosition()); _settingsItem->setCoordinate(_managerVehicle->homePosition());
} }
......
src/MissionManager/SimpleMissionItem.cc
View file @ 03b36370
...@@ -460,7 +460,7 @@ void SimpleMissionItem::_rebuildNaNFacts(void) ...@@ -460,7 +460,7 @@ void SimpleMissionItem::_rebuildNaNFacts(void)
if (!firmwareVehicle) { if (!firmwareVehicle) {
firmwareVehicle = _vehicle; firmwareVehicle = _vehicle;
} }
bool hideWaypointHeading = (command == MAV_CMD_NAV_WAYPOINT) && (i == 4) && firmwareVehicle->firmwarePlugin()->vehicleYawsToNextWaypointInMission(firmwareVehicle); bool hideWaypointHeading = (command == MAV_CMD_NAV_WAYPOINT || command == MAV_CMD_NAV_TAKEOFF) && (i == 4) && firmwareVehicle->firmwarePlugin()->vehicleYawsToNextWaypointInMission(firmwareVehicle);
if (hideWaypointHeading) { if (hideWaypointHeading) {
continue; continue;
} }
......
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