Merge pull request #4820 from DonLakeFlyer/SelectItem

Plan: Various bugs

src/MissionEditor/MissionEditor.qml

@@ -236,6 +236,7 @@ QGCView {
     /// Sets a new current mission item
     ///     @param sequenceNumber - index for new item, -1 to clear current item
     function setCurrentItem(sequenceNumber) {
+        console.log("setCurrentItem", sequenceNumber, _currentMissionIndex)
         if (sequenceNumber !== _currentMissionIndex) {
             _currentMissionItem = undefined
             _currentMissionIndex = -1
@@ -244,7 +245,7 @@ QGCView {
                 if (visualItem.sequenceNumber == sequenceNumber) {
                     _currentMissionItem = visualItem
                     _currentMissionItem.isCurrentItem = true
-                    _currentMissionIndex = i
+                    _currentMissionIndex = sequenceNumber
                 } else {
                     visualItem.isCurrentItem = false
                 }

src/MissionManager/MissionController.cc

@@ -794,7 +794,7 @@ void MissionController::_recalcWaypointLines(void)
         qWarning() << "First item is not MissionSettingsComplexItem";
     }
 
-    bool    showHomePosition =  false; // FIXME: settingsItem->showHomePosition();
+    bool showHomePosition = settingsItem->showHomePosition();
 
     qCDebug(MissionControllerLog) << "_recalcWaypointLines";