From c831e32db16d29b7212f85042bce3f3cababcb43 Mon Sep 17 00:00:00 2001
From: Michael Black W9MDB <mdblack98@yahoo.com>
Date: Fri, 26 Mar 2021 23:09:36 -0500
Subject: [PATCH] Fix icom.c frequency offset when the 0x25 is attempted and
 fails https://github.com/Hamlib/Hamlib/issues/629

---
 rigs/icom/icom.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c
index 082d88699..0afebe105 100644
--- a/rigs/icom/icom.c
+++ b/rigs/icom/icom.c
@@ -1278,7 +1278,7 @@ int icom_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
         {
             priv->x25cmdfails = 1;
             rig_debug(RIG_DEBUG_WARN,
-                      "%s: rig does not support 0x25 CI-V cmd...vfo swapping will occur\n", __func__);
+                      "%s: rig does not support 0x25 CI-V cmd\n", __func__);
         }
 
         freq_len--; // 0x25 cmd is 1 byte longer than 0x03 cmd
@@ -1287,6 +1287,7 @@ int icom_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
 
     if (priv->x25cmdfails) // then we're doing this the hard way....swap+read
     {
+        freqbuf_offset = 1;
         retval = set_vfo_curr(rig, vfo, rig->state.current_vfo);
 
         if (retval != RIG_OK)