From 68d4388df290c4dcd7de34a0538960808502ee32 Mon Sep 17 00:00:00 2001
From: Michael Black W9MDB <mdblack98@yahoo.com>
Date: Tue, 9 Mar 2021 07:42:16 -0600
Subject: [PATCH] Fix Yaesu not setting frequency
 https://github.com/Hamlib/Hamlib/issues/594

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

diff --git a/rigs/yaesu/newcat.c b/rigs/yaesu/newcat.c
index 3445ab14f..e69c6223f 100644
--- a/rigs/yaesu/newcat.c
+++ b/rigs/yaesu/newcat.c
@@ -9727,8 +9727,6 @@ int newcat_set_cmd_validate(RIG *rig)
         RETURNFUNC(-RIG_ENIMPL);
     }
 
-    if (strlen(valcmd) == 0) { return RIG_OK; }
-
     while (rc != RIG_OK && retry++ < retries)
     {
         int bytes;
@@ -9739,6 +9737,8 @@ int newcat_set_cmd_validate(RIG *rig)
 
         if (rc != RIG_OK) { RETURNFUNC(-RIG_EIO); }
 
+        if (strlen(valcmd) == 0) { RETURNFUNC(RIG_OK); }
+
         bytes = read_string(&state->rigport, priv->ret_data, sizeof(priv->ret_data),
                             &cat_term, sizeof(cat_term));
 
diff --git a/rigs/yaesu/newcat.h b/rigs/yaesu/newcat.h
index 127ebfbb1..19ea6aa0b 100644
--- a/rigs/yaesu/newcat.h
+++ b/rigs/yaesu/newcat.h
@@ -50,7 +50,7 @@
 typedef char ncboolean;
 
 /* shared function version */
-#define NEWCAT_VER "20210308"
+#define NEWCAT_VER "20210309"
 
 /* Hopefully large enough for future use, 128 chars plus '\0' */
 #define NEWCAT_DATA_LEN                 129