Browse Source

Merge pull request #8733 from DonLakeFlyer/OkToAddLand

Fix logic of when adding Landing item is allowed
QGC4.4
Don Gagne 5 years ago committed by GitHub
parent
commit
8cf72f186c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      src/MissionManager/MissionController.cc

6
src/MissionManager/MissionController.cc

@ -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)) {
_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);

Loading…
Cancel
Save