From c901126bf61888967e65a093abfd31c57fba65cf Mon Sep 17 00:00:00 2001
From: Mike Black W9MDB <mdblack98@yahoo.com>
Date: Thu, 16 Dec 2021 15:50:25 -0600
Subject: [PATCH] Ensure FTDX3000/5000 return ENAVAIL if tuner is on and meter
 is not SWR

---
 rigs/yaesu/newcat.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/rigs/yaesu/newcat.c b/rigs/yaesu/newcat.c
index 85331fc00..c2f3272fe 100644
--- a/rigs/yaesu/newcat.c
+++ b/rigs/yaesu/newcat.c
@@ -4599,10 +4599,14 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
             newcat_get_func(rig, RIG_VFO_A, RIG_FUNC_TUNER, &tuner);
             newcat_get_level(rig, RIG_VFO_A, RIG_LEVEL_METER, &meter);
 
-            if (meter.i == RIG_METER_SWR)
-                snprintf(priv->cmd_str, sizeof(priv->cmd_str), "RM%c%c", (tuner
-                         && meter.i == RIG_METER_SWR) ? '2' : '6',
-                         cat_term);
+            if (tuner && meter.i != RIG_METER_SWR)
+            {
+                RETURNFUNC(-RIG_ENAVAIL); // if meter not SWR can't read SWR
+            }
+
+            snprintf(priv->cmd_str, sizeof(priv->cmd_str), "RM%c%c", (tuner
+                     && meter.i == RIG_METER_SWR) ? '2' : '6',
+                     cat_term);
         }
         else
         {