From c2ced086aac89430c9458a91d77bfc43ea4a266d Mon Sep 17 00:00:00 2001 From: DoinLakeFlyer Date: Wed, 6 May 2020 12:49:14 -0700 Subject: [PATCH] Fix logic of when adding Landing item is allowed --- src/MissionManager/MissionController.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/MissionManager/MissionController.cc b/src/MissionManager/MissionController.cc index 6fdd837..bb664d1 100644 --- a/src/MissionManager/MissionController.cc +++ b/src/MissionManager/MissionController.cc @@ -2341,13 +2341,15 @@ void MissionController::setCurrentPlanViewSeqNum(int sequenceNumber, bool force) if (currentSeqNumber == sequenceNumber && _isROIBeginItem(simpleItem)) { _isROIBeginCurrentItem = true; } + } - if (simpleItem->specifiesCoordinate() && !simpleItem->isStandaloneCoordinate()) { + if (viIndex != 0) { + // Complex items are assumed to be fly through + if (!simpleItem || (simpleItem->specifiesCoordinate() && !simpleItem->isStandaloneCoordinate())) { lastFlyThroughSeqNum = currentSeqNumber; } } - if (currentSeqNumber == sequenceNumber) { pVI->setIsCurrentItem(true); pVI->setHasCurrentChildItem(false);