Browse Source

Persist link name when switching types.

QGC4.4
Gus Grubba 6 years ago
parent
commit
55175ff0f5
  1. 1
      src/comm/LinkManager.cc
  2. 3
      src/ui/preferences/LinkSettings.qml

1
src/comm/LinkManager.cc

@ -762,6 +762,7 @@ bool LinkManager::endConfigurationEditing(LinkConfiguration* config, LinkConfigu
saveLinkConfigurationList(); saveLinkConfigurationList();
// Tell link about changes (if any) // Tell link about changes (if any)
config->updateSettings(); config->updateSettings();
emit config->nameChanged(config->name());
// Discard temporary duplicate // Discard temporary duplicate
delete editedConfig; delete editedConfig;
} else { } else {

3
src/ui/preferences/LinkSettings.qml

@ -67,7 +67,6 @@ Rectangle {
text: object.name text: object.name
exclusiveGroup: linkGroup exclusiveGroup: linkGroup
visible: !object.dynamic visible: !object.dynamic
onClicked: { onClicked: {
checked = true checked = true
_currentSelection = object _currentSelection = object
@ -275,7 +274,7 @@ Rectangle {
linkSettingLoader.source = "" linkSettingLoader.source = ""
linkSettingLoader.visible = false linkSettingLoader.visible = false
// Save current name // Save current name
var name = editConfig.name var name = nameField.text
// Discard link configuration (old type) // Discard link configuration (old type)
QGroundControl.linkManager.cancelConfigurationEditing(editConfig) QGroundControl.linkManager.cancelConfigurationEditing(editConfig)
// Create new link configuration // Create new link configuration

Loading…
Cancel
Save