diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-02-20 02:09:23 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-20 02:09:23 -0500 |
| commit | 15df2ec3e985d506130a13147642f0e57f3e8754 (patch) | |
| tree | 2cb033377bce154b7d8648b8d76dec568661ee33 /Emby.Server.Implementations/LiveTv | |
| parent | aa9605ed7b07c3c96b2f7fed0799adbd055af980 (diff) | |
| parent | de3ca87a763506badcf1518ae288a5736605445c (diff) | |
Merge pull request #2478 from MediaBrowser/dev
Dev
Diffstat (limited to 'Emby.Server.Implementations/LiveTv')
| -rw-r--r-- | Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs index 1fc3dcd72..82f32efa2 100644 --- a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs +++ b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs @@ -635,6 +635,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV existingTimer.Status == RecordingStatus.Completed) { existingTimer.Status = RecordingStatus.New; + existingTimer.IsManual = true; _timerProvider.Update(existingTimer); return Task.FromResult(existingTimer.Id); } @@ -663,6 +664,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV RecordingHelper.CopyProgramInfoToTimerInfo(programInfo, timer); } + timer.IsManual = true; _timerProvider.Add(timer); return Task.FromResult(timer.Id); } @@ -758,6 +760,8 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV existingTimer.PostPaddingSeconds = updatedTimer.PostPaddingSeconds; existingTimer.IsPostPaddingRequired = updatedTimer.IsPostPaddingRequired; existingTimer.IsPrePaddingRequired = updatedTimer.IsPrePaddingRequired; + + _timerProvider.Update(existingTimer); } return Task.FromResult(true); @@ -2203,6 +2207,11 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV private bool ShouldCancelTimerForSeriesTimer(SeriesTimerInfo seriesTimer, TimerInfo timer) { + if (timer.IsManual) + { + return false; + } + if (!seriesTimer.RecordAnyTime) { if (Math.Abs(seriesTimer.StartDate.TimeOfDay.Ticks - timer.StartDate.TimeOfDay.Ticks) >= TimeSpan.FromMinutes(5).Ticks) |