From b83b8aba60e3106b07ddd48ea350302146b48d15 Mon Sep 17 00:00:00 2001 From: Mike Black W9MDB Date: Thu, 8 Jul 2021 12:50:28 -0500 Subject: [PATCH] register.c now correctly burps when bad model# is used https://github.com/Hamlib/Hamlib/issues/735 --- src/register.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/register.c b/src/register.c index 3d5a294dc..04d6dbf74 100644 --- a/src/register.c +++ b/src/register.c @@ -257,7 +257,6 @@ static int rig_lookup_backend(rig_model_t rig_model) { int i; - //if (rig_model >= 1000) rig_model = RIG_BACKEND_NUM(rig_model); for (i = 0; i < RIG_BACKEND_MAX && rig_backend_list[i].be_name; i++) { if (RIG_BACKEND_NUM(rig_model) == @@ -307,7 +306,15 @@ int HAMLIB_API rig_check_backend(rig_model_t rig_model) return -RIG_ENAVAIL; } - retval = rig_load_backend(rig_backend_list[be_idx].be_name); + // do we need to load the backend? + if (rig_backend_list[be_idx].be_init_all == 0) + { + retval = rig_load_backend(rig_backend_list[be_idx].be_name); + } + else + { + retval = -RIG_ENAVAIL; + } return retval; }