From ffe3c9d0127075237fd50dcec3f6bc029036021b Mon Sep 17 00:00:00 2001
From: Mike Black W9MDB <mdblack98@yahoo.com>
Date: Fri, 5 Nov 2021 06:37:45 -0500
Subject: [PATCH] Revert "Change rig_set_split_mode to use TOGGLE first, then
 set_vfo"

This reverts commit c1c549cbf34076e310de9f1e0a0ec3056bd07ea0.
---
 rigs/yaesu/newcat.c |  5 +++++
 src/rig.c           | 11 +++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/rigs/yaesu/newcat.c b/rigs/yaesu/newcat.c
index 9dd6cfa1b..51caaf936 100644
--- a/rigs/yaesu/newcat.c
+++ b/rigs/yaesu/newcat.c
@@ -1242,10 +1242,15 @@ int newcat_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
     {
         priv->cmd_str[2] = (RIG_VFO_B == vfo || RIG_VFO_SUB == vfo) ? '1' : '0';
     }
+    else // since we don't have targetable mode we will swap VFOS, set, and swap back
+    { // this should avoid some rig flashing 
+        sprintf(priv->cmd_str,"AB;MD0%c;AB;", newcat_modechar(mode));
+    }
 
     rig_debug(RIG_DEBUG_VERBOSE, "%s: generic mode = %s \n",
               __func__, rig_strrmode(mode));
 
+
     err = newcat_set_cmd(rig);
 
     if (err != RIG_OK)
diff --git a/src/rig.c b/src/rig.c
index 5d415d8b7..dc8f10166 100644
--- a/src/rig.c
+++ b/src/rig.c
@@ -4273,16 +4273,15 @@ int HAMLIB_API rig_set_split_mode(RIG *rig,
     }
 
 
-    // prefer the vfo swap method to reduce rig display flashing
-    if (rig_has_vfo_op(rig, RIG_OP_TOGGLE) && caps->vfo_op)
-    {
-        retcode = caps->vfo_op(rig, vfo, RIG_OP_TOGGLE);
-    }
-    else if (caps->set_vfo)
+    if (caps->set_vfo)
     {
         TRACE;
         retcode = caps->set_vfo(rig, tx_vfo);
     }
+    else if (rig_has_vfo_op(rig, RIG_OP_TOGGLE) && caps->vfo_op)
+    {
+        retcode = caps->vfo_op(rig, vfo, RIG_OP_TOGGLE);
+    }
     else
     {
         rig_debug(RIG_DEBUG_WARN,