From 79fdfe842505f238557bdd17deb9cde7f97d4ed0 Mon Sep 17 00:00:00 2001
From: Michael Black W9MDB <mdblack98@yahoo.com>
Date: Mon, 1 Jun 2020 12:53:07 -0500
Subject: [PATCH] Change vfo_fixup to just return when currVFO is requested
 https://github.com/Hamlib/Hamlib/issues/274

---
 src/rig.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/rig.c b/src/rig.c
index 620a97d7b..a6132d465 100644
--- a/src/rig.c
+++ b/src/rig.c
@@ -194,13 +194,12 @@ static vfo_t vfo_fixup(RIG *rig, vfo_t vfo)
 {
     rig_debug(RIG_DEBUG_TRACE, "%s: vfo=%s\n", __func__, rig_strvfo(vfo));
 
-#if 0 // Icoms require VFO_CURR -- 2020-05-30 -- if no other problems
-      // reported after WSJT-X is released delete this
-    if (vfo == RIG_VFO_CURR && rig->state.current_vfo == RIG_VFO_CURR)
+    if (vfo == RIG_VFO_CURR)
     {
-        vfo = RIG_VFO_A;
+        rig_debug(RIG_DEBUG_TRACE, "%s: Leaving currVFO alone\n", __func__);
+        return RIG_OK;  // don't modify vfo for RIG_VFO_CURR
     }
-#endif
+
     if (vfo == RIG_VFO_RX)
     {
         vfo = RIG_VFO_A;