Browse Source

Merge pull request #1486 from DonLakeFlyer/AirframeConfig

Fix crash on reconnect
QGC4.4
Don Gagne 10 years ago
parent
commit
31cc61db2a
  1. 5
      src/QGCApplication.cc

5
src/QGCApplication.cc

@ -619,7 +619,7 @@ void QGCApplication::reconnectAfterWait(int waitSeconds)
LinkInterface* link = linkManager->getLinks()[0]; LinkInterface* link = linkManager->getLinks()[0];
// Save the link configuration so we can restart the link laster // Save the link configuration so we can restart the link laster
_reconnectLinkConfig = linkManager->getLinks()[0]->getLinkConfiguration(); _reconnectLinkConfig = LinkConfiguration::duplicateSettings(linkManager->getLinks()[0]->getLinkConfiguration());
// Disconnect and wait // Disconnect and wait
@ -629,6 +629,9 @@ void QGCApplication::reconnectAfterWait(int waitSeconds)
void QGCApplication::_reconnect(void) void QGCApplication::_reconnect(void)
{ {
Q_ASSERT(_reconnectLinkConfig);
qgcApp()->restoreOverrideCursor(); qgcApp()->restoreOverrideCursor();
LinkManager::instance()->createConnectedLink(_reconnectLinkConfig); LinkManager::instance()->createConnectedLink(_reconnectLinkConfig);
_reconnectLinkConfig = NULL;
} }

Loading…
Cancel
Save