From 3fecc5d91eef45265784c55ded2f17d1f641b353 Mon Sep 17 00:00:00 2001
From: Michael Black W9MDB <mdblack98@yahoo.com>
Date: Fri, 8 May 2020 11:24:33 -0500
Subject: [PATCH] Only update cache.vfo when RIG_OK is returned

---
 src/rig.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/rig.c b/src/rig.c
index 2cd1e1a63..736c8f4a7 100644
--- a/src/rig.c
+++ b/src/rig.c
@@ -1814,12 +1814,12 @@ int HAMLIB_API rig_set_vfo(RIG *rig, vfo_t vfo)
     if (retcode == RIG_OK)
     {
         rig->state.current_vfo = vfo;
+        rig->state.cache.vfo = vfo;
     }
 
     // we need to update our internal freq to avoid getting detected as twiddling
     if (caps->get_freq) { retcode = rig_get_freq(rig, vfo, &curr_freq); }
 
-    rig->state.cache.vfo = vfo;
     // expire several cached items when we switch VFOs
     elapsed_ms(&rig->state.cache.time_vfo, ELAPSED_INVALIDATE);
     elapsed_ms(&rig->state.cache.time_freq, ELAPSED_INVALIDATE);