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
2b5b2d2d
Commit
2b5b2d2d
authored
Jan 08, 2017
by
Don Gagne
Committed by
GitHub
Jan 08, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #4408 from DonLakeFlyer/iOSPriorityLink
Allow fallback to first link even with no serial
parents
f9786913
8333bc68
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
Vehicle.cc
src/Vehicle/Vehicle.cc
+2
-2
No files found.
src/Vehicle/Vehicle.cc
View file @
2b5b2d2d
...
...
@@ -979,9 +979,9 @@ void Vehicle::_sendMessageOnLink(LinkInterface* link, mavlink_message_t message)
void
Vehicle
::
_updatePriorityLink
(
void
)
{
#ifndef NO_SERIAL_LINK
LinkInterface
*
newPriorityLink
=
NULL
;
#ifndef NO_SERIAL_LINK
// Note that this routine specificallty does not clear _priorityLink when there are no links remaining.
// By doing this we hold a reference on the last link as the Vehicle shuts down. Thus preventing shutdown
// ordering NULL pointer crashes where priorityLink() is still called during shutdown sequence.
...
...
@@ -1004,6 +1004,7 @@ void Vehicle::_updatePriorityLink(void)
}
}
}
#endif
if
(
!
newPriorityLink
&&
!
_priorityLink
.
data
()
&&
_links
.
count
())
{
newPriorityLink
=
_links
[
0
];
...
...
@@ -1012,7 +1013,6 @@ void Vehicle::_updatePriorityLink(void)
if
(
newPriorityLink
)
{
_priorityLink
=
qgcApp
()
->
toolbox
()
->
linkManager
()
->
sharedLinkInterfacePointerForLink
(
newPriorityLink
);
}
#endif
}
void
Vehicle
::
setLatitude
(
double
latitude
)
...
...
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