Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
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
Options
Browse Files
Download
Plain Diff
Merge pull request #8733 from DonLakeFlyer/OkToAddLand
Fix logic of when adding Landing item is allowed
parents
f48f8c8c
c2ced086
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
2 deletions
+4
-2
MissionController.cc
src/MissionManager/MissionController.cc
+4
-2
No files found.
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
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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