Merge branch 'master' of https://github.com/mdblack98/Hamlib

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;