From 2ba91017cf27d331c794b804c3879ff923c63eb9 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Mon, 20 Apr 2015 09:20:11 -0700 Subject: [PATCH] Fix crank on reconnect --- src/QGCApplication.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/QGCApplication.cc b/src/QGCApplication.cc index 972dcb8ee..914e30d4d 100644 --- a/src/QGCApplication.cc +++ b/src/QGCApplication.cc @@ -619,7 +619,7 @@ void QGCApplication::reconnectAfterWait(int waitSeconds) LinkInterface* link = linkManager->getLinks()[0]; // 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 @@ -629,6 +629,9 @@ void QGCApplication::reconnectAfterWait(int waitSeconds) void QGCApplication::_reconnect(void) { + Q_ASSERT(_reconnectLinkConfig); + qgcApp()->restoreOverrideCursor(); LinkManager::instance()->createConnectedLink(_reconnectLinkConfig); + _reconnectLinkConfig = NULL; } -- 2.22.0