Merge pull request #5496 from DonLakeFlyer/StableMerge

Stable merge

Merge pull request #5496 from DonLakeFlyer/StableMerge
Stable merge
03b36370 · Don Gagne · GitHub · 1077c75d · 3ea4a28d · 03b36370
Commit 03b36370 authored Jul 28, 2017 by Don Gagne Committed by GitHub Jul 28, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

MissionController.cc src/MissionManager/MissionController.cc +1 -1

SimpleMissionItem.cc src/MissionManager/SimpleMissionItem.cc +1 -1

No files found.
--- a/src/MissionManager/MissionController.cc
+++ b/src/MissionManager/MissionController.cc
@@ -1372,7 +1372,7 @@ void MissionController::_initAllVisualItems(void)
        _settingsItem->setIsCurrentItem(true);
    }

-    if (!_editMode && _managerVehicle->homePosition().isValid()) {
+    if (_managerVehicle->homePosition().isValid()) {
        _settingsItem->setCoordinate(_managerVehicle->homePosition());
    }


--- a/src/MissionManager/SimpleMissionItem.cc
+++ b/src/MissionManager/SimpleMissionItem.cc
@@ -460,7 +460,7 @@ void SimpleMissionItem::_rebuildNaNFacts(void)
                if (!firmwareVehicle) {
                    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) {
                    continue;
                }