Unverified Commit 753f36a0 authored by Gus Grubba's avatar Gus Grubba Committed by GitHub

Merge pull request #7939 from mavlink/pr_link_name

Persist link name when switching types.
parents 97a9a79a 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 {
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment