Skip to content

Q
qgroundcontrol
Unverified Commit 8cf72f18 authored by Don Gagne's avatar Don Gagne Committed by GitHub
Browse files
Options

Merge pull request #8733 from DonLakeFlyer/OkToAddLand 

Fix logic of when adding Landing item is allowed
parents f48f8c8c c2ced086
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
src/MissionManager/MissionController.cc
View file @ 8cf72f18
...@@ -2341,13 +2341,15 @@ void MissionController::setCurrentPlanViewSeqNum(int sequenceNumber, bool force) ...@@ -2341,13 +2341,15 @@ void MissionController::setCurrentPlanViewSeqNum(int sequenceNumber, bool force)
if (currentSeqNumber == sequenceNumber && _isROIBeginItem(simpleItem)) { if (currentSeqNumber == sequenceNumber && _isROIBeginItem(simpleItem)) {
_isROIBeginCurrentItem = true; _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; lastFlyThroughSeqNum = currentSeqNumber;
} }
} }
if (currentSeqNumber == sequenceNumber) { if (currentSeqNumber == sequenceNumber) {
pVI->setIsCurrentItem(true); pVI->setIsCurrentItem(true);
pVI->setHasCurrentChildItem(false); pVI->setHasCurrentChildItem(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