From 20e41b59ec89fddf40e391f0c2276041e226096f Mon Sep 17 00:00:00 2001 From: Michael Black W9MDB Date: Fri, 12 Mar 2021 12:12:20 -0600 Subject: [PATCH] Fix flrig close/open null return on modes https://github.com/Hamlib/Hamlib/issues/605 --- rigs/dummy/flrig.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/rigs/dummy/flrig.c b/rigs/dummy/flrig.c index c4d13efe4..1082e3b2a 100644 --- a/rigs/dummy/flrig.c +++ b/rigs/dummy/flrig.c @@ -1001,8 +1001,6 @@ static int flrig_close(RIG *rig) */ static int flrig_cleanup(RIG *rig) { - int i; - rig_debug(RIG_DEBUG_TRACE, "%s\n", __func__); if (!rig) { @@ -1012,15 +1010,24 @@ static int flrig_cleanup(RIG *rig) free(rig->state.priv); rig->state.priv = NULL; + // we really don't need to free this up as it's only done once + // was causing problem when cleanup was followed by rig_open + // model_flrig was not getting refilled + // if we can figure out that one we can re-enable this +#if 0 + int i; + for (i = 0; modeMap[i].mode_hamlib != 0; ++i) { if (modeMap[i].mode_flrig) { free(modeMap[i].mode_flrig); modeMap[i].mode_flrig = NULL; + modeMap[i].mode_hamlib = 0; } } +#endif RETURNFUNC(RIG_OK); }