mirror
/
Hamlib
kopia lustrzana https://github.com/Hamlib/Hamlib
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Fix flrig close/open null return on modes 

https://github.com/Hamlib/Hamlib/issues/605
pull/608/head
Michael Black W9MDB 2021-03-12 12:12:20 -06:00
rodzic 54f7a2dc70
commit 20e41b59ec
1 zmienionych plików z 9 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

11
rigs/dummy/flrig.c
Wyświetl plik

@ -1001,8 +1001,6 @@ static int flrig_close(RIG *rig)
*/ */
static int flrig_cleanup(RIG *rig) static int flrig_cleanup(RIG *rig)
{ {
int i;
rig_debug(RIG_DEBUG_TRACE, "%s\n", __func__); rig_debug(RIG_DEBUG_TRACE, "%s\n", __func__);
if (!rig) if (!rig)
{ {
@ -1012,15 +1010,24 @@ static int flrig_cleanup(RIG *rig)
free(rig->state.priv); free(rig->state.priv);
rig->state.priv = NULL; 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) for (i = 0; modeMap[i].mode_hamlib != 0; ++i)
{ {
if (modeMap[i].mode_flrig) if (modeMap[i].mode_flrig)
{ {
free(modeMap[i].mode_flrig); free(modeMap[i].mode_flrig);
modeMap[i].mode_flrig = NULL; modeMap[i].mode_flrig = NULL;
modeMap[i].mode_hamlib = 0;
} }
} }
#endif
RETURNFUNC(RIG_OK); RETURNFUNC(RIG_OK);
} }