mirror of git://git.sysmocom.de/ofono
Fix efli being removed prematurely
This commit is contained in:
parent
161fab2d48
commit
bb746b3e9d
10
src/sim.c
10
src/sim.c
|
@ -1170,10 +1170,6 @@ skip_efpl:
|
||||||
efli = parse_language_list(sim->efli, sim->efli_length);
|
efli = parse_language_list(sim->efli, sim->efli_length);
|
||||||
else
|
else
|
||||||
efli = parse_eflp(sim->efli, sim->efli_length);
|
efli = parse_eflp(sim->efli, sim->efli_length);
|
||||||
|
|
||||||
g_free(sim->efli);
|
|
||||||
sim->efli = NULL;
|
|
||||||
sim->efli_length = 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* If efli_format is TRUE, make a list of languages in both files in
|
/* If efli_format is TRUE, make a list of languages in both files in
|
||||||
|
@ -1195,6 +1191,12 @@ skip_efpl:
|
||||||
} else
|
} else
|
||||||
sim->language_prefs = concat_lang_prefs(efpl, efli);
|
sim->language_prefs = concat_lang_prefs(efpl, efli);
|
||||||
|
|
||||||
|
if (sim->efli) {
|
||||||
|
g_free(sim->efli);
|
||||||
|
sim->efli = NULL;
|
||||||
|
sim->efli_length = 0;
|
||||||
|
}
|
||||||
|
|
||||||
if (efli) {
|
if (efli) {
|
||||||
g_slist_foreach(efli, (GFunc)g_free, NULL);
|
g_slist_foreach(efli, (GFunc)g_free, NULL);
|
||||||
g_slist_free(efli);
|
g_slist_free(efli);
|
||||||
|
|
Loading…
Reference in New Issue