From 837ca29ac847685c671dd8d805068eeb544993c0 Mon Sep 17 00:00:00 2001
From: Paul Hollinsky <phollinsky@intrepidcs.com>
Date: Mon, 10 Dec 2018 14:58:28 -0500
Subject: [PATCH] Improved FTDI device finding logic

---
 platform/windows/vcp.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/platform/windows/vcp.cpp b/platform/windows/vcp.cpp
index 30d463c..58e52ce 100644
--- a/platform/windows/vcp.cpp
+++ b/platform/windows/vcp.cpp
@@ -101,15 +101,20 @@ std::vector<neodevice_t> VCP::FindByProduct(int product, std::vector<std::wstrin
 			}
 
 			bool alreadyFound = false;
+			neodevice_t* shouldReplace = nullptr;
 			for(auto& foundDev : found) {
-				if(foundDev.handle == device.handle && serial == foundDev.serial) {
+				if((foundDev.handle == device.handle || foundDev.handle == 0 || device.handle == 0) && serial == foundDev.serial) {
 					alreadyFound = true;
+					if(foundDev.handle == 0)
+						shouldReplace = &foundDev;
 					break;
 				}
 			}
 
 			if(!alreadyFound)
 				found.push_back(device);
+			else if(shouldReplace != nullptr)
+				*shouldReplace = device;
 		}
 	}