X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosuilib%2FAltosUSBDevice.java;h=4f329840bdbe88aba6b33305ee43a9e808b8e405;hp=005a3e4987d377c330c12efb3a8c8728acb7cbee;hb=1183417145de549b9281f9e210d216facf3a94ef;hpb=e0af4569446b12c026aa0ffd52c55839d69af0e1

diff --git a/altosuilib/AltosUSBDevice.java b/altosuilib/AltosUSBDevice.java
index 005a3e49..4f329840 100644
--- a/altosuilib/AltosUSBDevice.java
+++ b/altosuilib/AltosUSBDevice.java
@@ -68,20 +68,20 @@ public class AltosUSBDevice  extends altos_device implements AltosDevice {
 		if (want_product == AltosUILib.product_any)
 			return true;
 
+		int have_product = getProduct();
+
 		if (want_product == AltosUILib.product_basestation)
-			return matchProduct(AltosUILib.product_teledongle) ||
-				matchProduct(AltosUILib.product_teleterra) ||
-				matchProduct(AltosUILib.product_telebt) ||
-				matchProduct(AltosUILib.product_megadongle);
+			return have_product == AltosUILib.product_teledongle ||
+				have_product == AltosUILib.product_teleterra ||
+				have_product == AltosUILib.product_telebt ||
+				have_product == AltosUILib.product_megadongle;
 
 		if (want_product == AltosUILib.product_altimeter)
-			return matchProduct(AltosUILib.product_telemetrum) ||
-				matchProduct(AltosUILib.product_telemega) ||
-				matchProduct(AltosUILib.product_telegps) ||
-				matchProduct(AltosUILib.product_easymini) ||
-				matchProduct(AltosUILib.product_telemini);
-
-		int have_product = getProduct();
+			return have_product == AltosUILib.product_telemetrum ||
+				have_product == AltosUILib.product_telemega ||
+				have_product == AltosUILib.product_telegps ||
+				have_product == AltosUILib.product_easymini ||
+				have_product == AltosUILib.product_telemini;
 
 		if (have_product == AltosUILib.product_altusmetrum)	/* old devices match any request */
 			return true;