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
55175ff0
Commit
55175ff0
authored
Oct 20, 2019
by
Gus Grubba
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Persist link name when switching types.
parent
97a9a79a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
LinkManager.cc
src/comm/LinkManager.cc
+1
-0
LinkSettings.qml
src/ui/preferences/LinkSettings.qml
+1
-2
No files found.
src/comm/LinkManager.cc
View file @
55175ff0
...
...
@@ -762,6 +762,7 @@ bool LinkManager::endConfigurationEditing(LinkConfiguration* config, LinkConfigu
saveLinkConfigurationList
();
// Tell link about changes (if any)
config
->
updateSettings
();
emit
config
->
nameChanged
(
config
->
name
());
// Discard temporary duplicate
delete
editedConfig
;
}
else
{
...
...
src/ui/preferences/LinkSettings.qml
View file @
55175ff0
...
...
@@ -67,7 +67,6 @@ Rectangle {
text
:
object
.
name
exclusiveGroup
:
linkGroup
visible
:
!
object
.
dynamic
onClicked
:
{
checked
=
true
_currentSelection
=
object
...
...
@@ -275,7 +274,7 @@ Rectangle {
linkSettingLoader
.
source
=
""
linkSettingLoader
.
visible
=
false
// Save current name
var
name
=
editConfig
.
name
var
name
=
nameField
.
text
// Discard link configuration (old type)
QGroundControl
.
linkManager
.
cancelConfigurationEditing
(
editConfig
)
// Create new link configuration
...
...
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