From fe1eabf531f23f9057270a68cc18905567c91c05 Mon Sep 17 00:00:00 2001
From: Mike Black W9MDB <mdblack98@yahoo.com>
Date: Tue, 28 Feb 2023 16:57:47 -0600
Subject: [PATCH] Win4Yaesu is not recognizing EX commands so we ignore errors
 on the EX command for some Yaeus rigs

---
 rigs/yaesu/newcat.c | 6 +++++-
 rigs/yaesu/newcat.h | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/rigs/yaesu/newcat.c b/rigs/yaesu/newcat.c
index 00c1f7581..18ed14fa5 100644
--- a/rigs/yaesu/newcat.c
+++ b/rigs/yaesu/newcat.c
@@ -545,6 +545,7 @@ int newcat_open(RIG *rig)
     const char *handshake[3] = {"None", "Xon/Xoff", "Hardware"};
     int err;
     int set_only = 0;
+    int retry_save = 0;
 
     ENTERFUNC;
 
@@ -618,6 +619,8 @@ int newcat_open(RIG *rig)
 
         SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "%s", cmd);
 
+        retry_save = rig->state.rigport.retry;
+        rig->state.rigport.retry = 0;
         if (set_only)
         {
             err = newcat_set_cmd(rig);
@@ -626,10 +629,11 @@ int newcat_open(RIG *rig)
         {
             err = newcat_get_cmd(rig);
         }
+        rig->state.rigport.retry = retry_save;
 
         if (err != RIG_OK)
         {
-            RETURNFUNC(err);
+          // if we can an err we just ignore the failure -- Win4Yaesu was not recognizing EX032 command  
         }
     }
 
diff --git a/rigs/yaesu/newcat.h b/rigs/yaesu/newcat.h
index 5509c0876..1844e9c92 100644
--- a/rigs/yaesu/newcat.h
+++ b/rigs/yaesu/newcat.h
@@ -50,7 +50,7 @@
 typedef char ncboolean;
 
 /* shared function version */
-#define NEWCAT_VER "20230214"
+#define NEWCAT_VER "20230228"
 
 /* Hopefully large enough for future use, 128 chars plus '\0' */
 #define NEWCAT_DATA_LEN                 129