DVR: space cleanup: optimize the file deletion and load the log retention timer

diff --git a/src/dvr/dvr_vfsmgr.c b/src/dvr/dvr_vfsmgr.c
index 59a4cff00423fe6a31a57a6d413a8a39ffeb47b3..a87539e0f35574e6f7a566215e8647cbc64a1930 100644 (file)
--- a/src/dvr/dvr_vfsmgr.c
+++ b/src/dvr/dvr_vfsmgr.c
@@ -261,9 +261,12 @@ dvr_disk_space_cleanup(dvr_config_t *cfg)
              lang_str_get(oldest->de_title, NULL), tbuf, TOMIB(fileSize));
 
       dvr_disk_space_config_lastdelete = dispatch_clock;
-      dvr_entry_delete(oldest, 1);    // delete actual file
-      if (dvr_entry_get_retention_days(oldest) == DVR_RET_ONREMOVE)
+      if (dvr_entry_get_retention_days(oldest) == DVR_RET_ONREMOVE) {
+        dvr_entry_delete(oldest, 1);  // delete actual file
         dvr_entry_destroy(oldest, 1); // also delete database entry
+      } else {
+        dvr_entry_delete(oldest, 0);  // delete actual file
+      }
     } else {
       tvhlog(LOG_WARNING, "dvr", "%s \"until space needed\" recordings found for config \"%s\", you are running out of disk space very soon!",
              loops > 0 ? "Not enough" : "No", configName);