Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
dvr timerec: don't delete spawned recordings on shutdown
  • Loading branch information
perexg committed Oct 2, 2014
1 parent e3762f1 commit 2692fa6
Showing 1 changed file with 10 additions and 8 deletions.
18 changes: 10 additions & 8 deletions src/dvr/dvr_timerec.c
Expand Up @@ -67,17 +67,19 @@ dvr_timerec_timecorrection(time_t clk, int hm, struct tm *tm)
* Unlink - and remove any unstarted
*/
static void
dvr_timerec_purge_spawn(dvr_timerec_entry_t *dte)
dvr_timerec_purge_spawn(dvr_timerec_entry_t *dte, int delconf)
{
dvr_entry_t *de = dte->dte_spawn;

if (de && de->de_timerec) {
dte->dte_spawn = NULL;
de->de_timerec = NULL;
if (de->de_sched_state == DVR_SCHEDULED)
dvr_entry_cancel(de);
else
dvr_entry_save(de);
if (delconf) {
if (de->de_sched_state == DVR_SCHEDULED)
dvr_entry_cancel(de);
else
dvr_entry_save(de);
}
}
}

Expand Down Expand Up @@ -147,7 +149,7 @@ dvr_timerec_check(dvr_timerec_entry_t *dte)
if (de) {
if (de->de_start == start && de->de_stop == stop)
return;
dvr_timerec_purge_spawn(dte);
dvr_timerec_purge_spawn(dte, 1);
}

title = dvr_timerec_title(dte, &tm_start);
Expand All @@ -163,7 +165,7 @@ dvr_timerec_check(dvr_timerec_entry_t *dte)
return;

fail:
dvr_timerec_purge_spawn(dte);
dvr_timerec_purge_spawn(dte, 1);
}

/**
Expand Down Expand Up @@ -204,7 +206,7 @@ dvr_timerec_create(const char *uuid, htsmsg_t *conf)
static void
timerec_entry_destroy(dvr_timerec_entry_t *dte, int delconf)
{
dvr_timerec_purge_spawn(dte);
dvr_timerec_purge_spawn(dte, delconf);

if (delconf)
hts_settings_remove("dvr/timerec/%s", idnode_uuid_as_str(&dte->dte_id));
Expand Down

0 comments on commit 2692fa6

Please sign in to comment.