From 24c18938c284300ff4cab7a1b516058dffa4de36 Mon Sep 17 00:00:00 2001 From: Mike Black W9MDB Date: Tue, 7 Jun 2022 22:50:59 -0500 Subject: [PATCH] Only call rig_get_vfo in icom_set_vfo if get_vfo is enabled --- src/rig.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/rig.c b/src/rig.c index 5552d5f57..e4663bcec 100644 --- a/src/rig.c +++ b/src/rig.c @@ -2629,15 +2629,18 @@ int HAMLIB_API rig_set_vfo(RIG *rig, vfo_t vfo) if (vfo == RIG_VFO_CURR) { RETURNFUNC(RIG_OK); } - retcode = rig_get_vfo(rig, &curr_vfo); - - if (retcode != RIG_OK) + if (rig->caps->get_vfo) { - rig_debug(RIG_DEBUG_WARN, "%s: rig_get_vfo error=%s\n", __func__, - rigerror(retcode)); - } + retcode = rig_get_vfo(rig, &curr_vfo); - if (curr_vfo == vfo) { RETURNFUNC(RIG_OK); } + if (retcode != RIG_OK) + { + rig_debug(RIG_DEBUG_WARN, "%s: rig_get_vfo error=%s\n", __func__, + rigerror(retcode)); + } + + if (curr_vfo == vfo) { RETURNFUNC(RIG_OK); } + } #if 0 // removing this check 20210801 -- should be mapped already