[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. 20e41b59ec89fddf40e391f0c2276041e226096f

[Michael B. <mdb...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Hamlib -- Ham radio control libraries".

The branch, master has been updated
       via  20e41b59ec89fddf40e391f0c2276041e226096f (commit)
      from  54f7a2dc70cbe59adb2300034dc1f7a5a4cd8c44 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 20e41b59ec89fddf40e391f0c2276041e226096f
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Fri Mar 12 12:12:20 2021 -0600

    Fix flrig close/open null return on modes
    https://github.com/Hamlib/Hamlib/issues/605

diff --git a/rigs/dummy/flrig.c b/rigs/dummy/flrig.c
index c4d13efe..1082e3b2 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);
 }

-----------------------------------------------------------------------

Summary of changes:
 rigs/dummy/flrig.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Hamlib -- Ham radio control libraries