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

Fix problem with migration of old style configuration files.

Browse source
This commit is contained in:
Adam Sutton 2012-08-01 15:38:24 +01:00
parent e0f49eb077
commit 7c35a73c1a
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/epggrab.c
View file

@ -169,9 +169,16 @@ static void _epggrab_load ( void )
}
}
htsmsg_destroy(m);
/* Finish up migration */
if (old) {
/* Enable OTA modules */
LIST_FOREACH(mod, &epggrab_modules, link)
if (mod->type == EPGGRAB_OTA)
epggrab_enable_module(mod, 1);
/* Migrate XMLTV channels */
htsmsg_t *xc, *ch;
htsmsg_t *xchs = hts_settings_load("xmltv/channels");
htsmsg_t *chs = hts_settings_load("channels");
@ -198,12 +205,11 @@ static void _epggrab_load ( void )
/* Defaults */
} else {
epggrab_module_t *m;
epggrab_interval = 12 * 3600; // hours
epggrab_module = NULL; // disabled
LIST_FOREACH(m, &epggrab_modules, link) // enable all OTA by default
if (m->type == EPGGRAB_OTA)
epggrab_enable_module(m, 1);
LIST_FOREACH(mod, &epggrab_modules, link) // enable all OTA by default
if (mod->type == EPGGRAB_OTA)
epggrab_enable_module(mod, 1);
}
/* Load module config (channels) */