Browse Source

Merge pull request #4358 from DonLakeFlyer/LinkRefBugFix

Link reference bug fix
QGC4.4
Don Gagne 9 years ago committed by GitHub
parent
commit
36c9966dbd
  1. 3
      src/QmlControls/ParameterEditorDialog.qml
  2. 7
      src/comm/LinkManager.cc

3
src/QmlControls/ParameterEditorDialog.qml

@ -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

7
src/comm/LinkManager.cc

@ -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

Loading…
Cancel
Save