From 23bf95523c4efdd6d3941b3863ef80cdd1a32ec6 Mon Sep 17 00:00:00 2001 From: Glenn-1990 Date: Sun, 18 Dec 2016 16:59:43 +0100 Subject: [PATCH] Abort recording on disable --- src/dvr/dvr_db.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/dvr/dvr_db.c b/src/dvr/dvr_db.c index 3877042f9..a1a7be0fc 100644 --- a/src/dvr/dvr_db.c +++ b/src/dvr/dvr_db.c @@ -764,6 +764,10 @@ dvr_entry_set_timer(dvr_entry_t *de) return; } else if (de->de_sched_state == DVR_RECORDING) { + if (!de->de_enabled) { + dvr_stop_recording(de, SM_CODE_ABORTED, 1, 0); + return; + } recording: dvr_entry_trace_time1(de, "stop", stop, "set timer - arm"); @@ -1684,7 +1688,7 @@ static dvr_entry_t *_dvr_entry_update de->de_stop_extra = stop_extra; save |= DVR_UPDATED_STOP_EXTRA; } - if (save & (DVR_UPDATED_STOP|DVR_UPDATED_STOP_EXTRA)) { + if (save & (DVR_UPDATED_STOP|DVR_UPDATED_STOP_EXTRA|DVR_UPDATED_ENABLED)) { updated = 1; dvr_entry_set_timer(de); } -- 2.47.2