From fb86c8cf558f569dc69adca9271e99d8bea6f8d8 Mon Sep 17 00:00:00 2001
From: Mike Black W9MDB <mdblack98@yahoo.com>
Date: Sat, 4 Jun 2022 08:13:19 -0500
Subject: [PATCH] Have rig_open return intelligent error message when USB
 device is requested

---
 src/rig.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/rig.c b/src/rig.c
index 8ededa71f..579dace78 100644
--- a/src/rig.c
+++ b/src/rig.c
@@ -795,6 +795,13 @@ int HAMLIB_API rig_open(RIG *rig)
     rs->rigport.rig = rig;
     rs->rigport_deprecated.rig = rig;
 
+    if (strcmp(rs->rigport.pathname,"USB")==0)
+    {
+        rig_debug(RIG_DEBUG_ERR, "%s: 'USB' is not a valid COM port name\n", __func__);
+        errno = 2;
+        RETURNFUNC(-RIG_EINVAL);
+    }
+
     // rigctl/rigctld may have deprecated values -- backwards compatility
     if (rs->rigport_deprecated.pathname[0] != 0)
     {