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

DVR: Fix dvr_config_find_by_name_default (no config files)

Browse source
This commit is contained in:
Jaroslav Kysela 2014-09-17 16:10:37 +02:00
parent b3586c2f3b
commit 6ddd022056
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/dvr/dvr_config.c
View file

@ -66,7 +66,14 @@ dvr_config_find_by_name_default(const char *name)
{
dvr_config_t *cfg;
if (dvrdefaultconfig && (name == NULL || *name == '\0'))
if (LIST_FIRST(&dvrconfigs) == NULL) {
cfg = dvr_config_create("", NULL, NULL);
assert(cfg);
dvr_config_save(cfg);
dvrdefaultconfig = cfg;
}
if (name == NULL || *name == '\0')
return dvrdefaultconfig;
cfg = dvr_config_find_by_name(name);
@ -74,16 +81,10 @@ dvr_config_find_by_name_default(const char *name)
if (cfg == NULL) {
if (name && *name)
tvhlog(LOG_WARNING, "dvr", "Configuration '%s' not found, using default", name);
cfg = dvr_config_find_by_name_default(NULL);
cfg = dvrdefaultconfig;
} else if (!cfg->dvr_enabled) {
tvhlog(LOG_WARNING, "dvr", "Configuration '%s' not enabled, using default", name);
cfg = dvr_config_find_by_name_default(NULL);
}
if (cfg == NULL) {
cfg = dvr_config_create("", NULL, NULL);
dvr_config_save(cfg);
dvrdefaultconfig = cfg;
cfg = dvrdefaultconfig;
}
return cfg;