DVR: Fix dvr_config_find_by_name_default (no config files)

tvheadend · Sep 17, 2014 · 6ddd022 · 6ddd022
1 parent b3586c2
commit 6ddd022
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/src/dvr/dvr_config.c b/src/dvr/dvr_config.c
@@ -66,24 +66,25 @@ 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);
 
   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;