From 6ca98441967d2ab2b1b42627bb1cc90be4160736 Mon Sep 17 00:00:00 2001 From: Mike Black W9MDB Date: Fri, 5 Nov 2021 17:23:10 -0500 Subject: [PATCH] In rig.c do not override curr_vfo if it gets set by the backend https://github.com/Hamlib/Hamlib/issues/853 --- src/rig.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/rig.c b/src/rig.c index dc8f10166..db72992d6 100644 --- a/src/rig.c +++ b/src/rig.c @@ -1041,11 +1041,13 @@ int HAMLIB_API rig_open(RIG *rig) { rs->tx_vfo = rs->current_vfo; } - else // vfo fails so set some sensible defaults + else // no get_vfo so set some sensible defaults { //int backend_num = RIG_BACKEND_NUM(rig->caps->rig_model); rs->tx_vfo = RIG_VFO_TX; - rs->current_vfo = RIG_VFO_CURR; + // If we haven't gotten the vfo by now we will default to VFO_CURR + if (rs->current_vfo == RIG_VFO_NONE) rs->current_vfo = RIG_VFO_CURR; + rig_debug(RIG_DEBUG_TRACE, "%s: vfo_curr=%s, tx_vfo=%s\n", __func__, rig_strvfo(rs->current_vfo), rig_strvfo(rs->tx_vfo)); #if 0 // done in the back end