altosui: Work around lack of actual USB product names on Windows

[fw/altos] / altosuilib / AltosFlashUI.java

diff --git a/altosuilib/AltosFlashUI.java b/altosuilib/AltosFlashUI.java
index 33fdb6887238f8e530a71f7954a7d6b068fb54ba..6b78aea7f69a2706a3e2d439159ec2ecfe42a6f5 100644 (file)
--- a/altosuilib/AltosFlashUI.java
+++ b/altosuilib/AltosFlashUI.java
@@ -208,9 +208,18 @@ public class AltosFlashUI
 
                public AltosHexfileFilter(String usb_product) {
                        int l;
+                       int dash;
 
                        /* Trim off any trailing variants (1.0a vs 1.0) */
-                       for (l = usb_product.length(); l > 0; l--) {
+                       for (dash = usb_product.length(); dash > 0; dash--) {
+                               char c = usb_product.charAt(dash-1);
+                               if (c == '-')
+                                       break;
+                       }
+                       if (dash == 0)
+                               dash = usb_product.length();
+
+                       for (l = usb_product.length(); l > dash; l--) {
                                char c = usb_product.charAt(l-1);
                                if (c < 'a' || 'z' < c)
                                        break;