From 3fedd530cee6047eb36e253398b716d4ac8b242d Mon Sep 17 00:00:00 2001
From: Stefan Rueger <stefan.rueger@urclocks.com>
Date: Wed, 17 Jun 2026 18:42:31 +0100
Subject: [PATCH] Fix messaging when no matching device found

---
 src/jtag3.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/jtag3.c b/src/jtag3.c
index c058b8bf..f2d99545 100644
--- a/src/jtag3.c
+++ b/src/jtag3.c
@@ -1698,6 +1698,7 @@ int jtag3_open_common(PROGRAMMER *pgm, const char *port, int mode_switch) {
 
   if(rv < 0) {
     // Check if SNAP or PICkit4 are in PIC mode
+    unsigned short vidbak = pinfo.usbinfo.vid; // Save vid
     for(LNODEID ln = lfirst(pgm->id); ln; ln = lnext(ln)) {
       if(str_starts(ldata(ln), "snap") || str_starts(ldata(ln), "pickit4")) {
         bool is_snap_pgm = str_starts(ldata(ln), "snap");
@@ -1763,20 +1764,19 @@ int jtag3_open_common(PROGRAMMER *pgm, const char *port, int mode_switch) {
         }
       }
     }
+    pinfo.usbinfo.vid = vidbak; // Restore vid
+
     pmsg_error("no device found matching VID 0x%04x and PID list: ", (unsigned) pinfo.usbinfo.vid);
     int notfirst = 0;
-
     for(usbpid = lfirst(pgm->usbpid); usbpid; usbpid = lnext(usbpid)) {
       if(notfirst)
         msg_error(", ");
       msg_error("0x%04x", (unsigned int) *(int *) ldata(usbpid));
       notfirst = 1;
     }
-
-    char *serno;
-
-    if((serno = strchr(port, ':')))
-      msg_error(" with SN %s", ++serno);
+    char serno[64] = {0};
+    if(str_set_vid_pid_serno(port, NULL, NULL, 0, serno, sizeof serno) >= 0 && *serno)
+      msg_error(" with SN %s", serno);
     msg_error("\n");
 
     return -1;