Commit 36c9966d authored by Don Gagne's avatar Don Gagne Committed by GitHub

Merge pull request #4358 from DonLakeFlyer/LinkRefBugFix

Link reference bug fix
parents bc0ecce0 4211b7e9
...@@ -126,7 +126,8 @@ QGCViewDialog { ...@@ -126,7 +126,8 @@ QGCViewDialog {
QGCComboBox { QGCComboBox {
id: factCombo id: factCombo
width: valueField.width anchors.left: parent.left
anchors.right: parent.right
visible: _showCombo visible: _showCombo
model: fact.enumStrings model: fact.enumStrings
......
...@@ -642,16 +642,15 @@ void LinkManager::_updateAutoConnectLinks(void) ...@@ -642,16 +642,15 @@ void LinkManager::_updateAutoConnectLinks(void)
// Now remove all configs that are gone // Now remove all configs that are gone
foreach (LinkConfiguration* pDeleteConfig, _confToDelete) { foreach (LinkConfiguration* pDeleteConfig, _confToDelete) {
qCDebug(LinkManagerLog) << "Removing unused autoconnect config" << pDeleteConfig->name(); qCDebug(LinkManagerLog) << "Removing unused autoconnect config" << pDeleteConfig->name();
if (pDeleteConfig->link()) {
disconnectLink(pDeleteConfig->link());
}
for (int i=0; i<_sharedAutoconnectConfigurations.count(); i++) { for (int i=0; i<_sharedAutoconnectConfigurations.count(); i++) {
if (_sharedAutoconnectConfigurations[i].data() == pDeleteConfig) { if (_sharedAutoconnectConfigurations[i].data() == pDeleteConfig) {
_sharedAutoconnectConfigurations.removeAt(i); _sharedAutoconnectConfigurations.removeAt(i);
break; break;
} }
} }
if (pDeleteConfig->link()) {
disconnectLink(pDeleteConfig->link());
}
delete pDeleteConfig;
} }
#endif #endif
#endif // NO_SERIAL_LINK #endif // NO_SERIAL_LINK
......
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