Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
8cf72f18
Unverified
Commit
8cf72f18
authored
May 06, 2020
by
Don Gagne
Committed by
GitHub
May 06, 2020
Browse files
Merge pull request #8733 from DonLakeFlyer/OkToAddLand
Fix logic of when adding Landing item is allowed
parents
f48f8c8c
c2ced086
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/MissionManager/MissionController.cc
View file @
8cf72f18
...
...
@@ -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
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment