From f7afcef816d76a850d8f20aea8f086d2cb28e8fd Mon Sep 17 00:00:00 2001
From: Lorenz Meier <lm@inf.ethz.ch>
Date: Thu, 14 May 2015 16:46:56 +0200
Subject: [PATCH] LinkManager: Do not connect to PX4 boards in bootloader mode
 automatically. Fixes #1574

---
 src/comm/LinkManager.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/comm/LinkManager.cc b/src/comm/LinkManager.cc
index b162e29e4..aef67729a 100644
--- a/src/comm/LinkManager.cc
+++ b/src/comm/LinkManager.cc
@@ -458,8 +458,8 @@ void LinkManager::_updateConfigurationList(void)
 #endif
         // Save port name
         currentPorts << portInfo.systemLocation();
-        // Is this a PX4?
-        if (portInfo.vendorIdentifier() == 9900) {
+        // Is this a PX4 and NOT in bootloader mode?
+        if (portInfo.vendorIdentifier() == 9900 && !portInfo.description().contains("BL")) {
             SerialConfiguration* pSerial = _findSerialConfiguration(portInfo.systemLocation());
             if (pSerial) {
                 //-- If this port is configured make sure it has the preferred flag set
-- 
2.22.0