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
36c9966d
Commit
36c9966d
authored
Dec 28, 2016
by
Don Gagne
Committed by
GitHub
Dec 28, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #4358 from DonLakeFlyer/LinkRefBugFix
Link reference bug fix
parents
bc0ecce0
4211b7e9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
ParameterEditorDialog.qml
src/QmlControls/ParameterEditorDialog.qml
+2
-1
LinkManager.cc
src/comm/LinkManager.cc
+3
-4
No files found.
src/QmlControls/ParameterEditorDialog.qml
View file @
36c9966d
...
...
@@ -126,7 +126,8 @@ QGCViewDialog {
QGCComboBox
{
id
:
factCombo
width
:
valueField
.
width
anchors.left
:
parent
.
left
anchors.right
:
parent
.
right
visible
:
_showCombo
model
:
fact
.
enumStrings
...
...
src/comm/LinkManager.cc
View file @
36c9966d
...
...
@@ -642,16 +642,15 @@ void LinkManager::_updateAutoConnectLinks(void)
// Now remove all configs that are gone
foreach
(
LinkConfiguration
*
pDeleteConfig
,
_confToDelete
)
{
qCDebug
(
LinkManagerLog
)
<<
"Removing unused autoconnect config"
<<
pDeleteConfig
->
name
();
if
(
pDeleteConfig
->
link
())
{
disconnectLink
(
pDeleteConfig
->
link
());
}
for
(
int
i
=
0
;
i
<
_sharedAutoconnectConfigurations
.
count
();
i
++
)
{
if
(
_sharedAutoconnectConfigurations
[
i
].
data
()
==
pDeleteConfig
)
{
_sharedAutoconnectConfigurations
.
removeAt
(
i
);
break
;
}
}
if
(
pDeleteConfig
->
link
())
{
disconnectLink
(
pDeleteConfig
->
link
());
}
delete
pDeleteConfig
;
}
#endif
#endif // NO_SERIAL_LINK
...
...
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