From 1ca003e56c39fabab03fea7d61171ba456395683 Mon Sep 17 00:00:00 2001
From: Don Gagne <don@thegagnes.com>
Date: Thu, 3 Dec 2015 13:53:56 -0800
Subject: [PATCH] Disconnect inactive links

---
 src/VehicleSetup/FirmwareUpgradeController.cc | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/VehicleSetup/FirmwareUpgradeController.cc b/src/VehicleSetup/FirmwareUpgradeController.cc
index c6a01bf..8e3f28c 100644
--- a/src/VehicleSetup/FirmwareUpgradeController.cc
+++ b/src/VehicleSetup/FirmwareUpgradeController.cc
@@ -78,7 +78,14 @@ FirmwareUpgradeController::~FirmwareUpgradeController()
 
 void FirmwareUpgradeController::startBoardSearch(void)
 {
-    qgcApp()->toolbox()->linkManager()->setConnectionsSuspended(tr("Connect not allowed during Firmware Upgrade."));
+    LinkManager* linkMgr = qgcApp()->toolbox()->linkManager();
+
+    linkMgr->setConnectionsSuspended(tr("Connect not allowed during Firmware Upgrade."));
+
+    if (!linkMgr->anyActiveLinks()) {
+        // We have to disconnect any inactive links
+        linkMgr->disconnectAll();
+    }
     _bootloaderFound = false;
     _startFlashWhenBootloaderFound = false;
     _threadController->startFindBoardLoop();