stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Ensure 2.12 iptv config is migrated (note it does not delete old config). Fixes #1217.

Browse source
This commit is contained in:
Adam Sutton 2012-09-19 11:59:54 +01:00
parent b9e8945ddb
commit 61a0d2aff2
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/iptv_input.c
View file

@ -568,11 +568,16 @@ iptv_service_load(void)
const char *s;
unsigned int u32;
service_t *t;
int old = 0;
lock_assert(&global_lock);
if((l = hts_settings_load("iptvservices")) == NULL)
return;
if((l = hts_settings_load("iptvservices")) == NULL) {
if ((l = hts_settings_load("iptvtransports")) == NULL)
return;
else
old = 1;
}
HTSMSG_FOREACH(f, l) {
if((c = htsmsg_get_map_by_field(f)) == NULL)
@ -614,6 +619,10 @@ iptv_service_load(void)
if(s && u32)
service_map_channel(t, channel_find_by_name(s, 1, 0), 0);
/* Migrate to new */
if(old)
iptv_service_save(t);
}
htsmsg_destroy(l);
}