diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-09-08 12:14:23 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-08 12:14:23 -0400 |
| commit | 2a7806665853070624539260b2af5e16dbe219bb (patch) | |
| tree | a36814db6b9c099fc5ead90d9a8967c0ef6d6c38 /MediaBrowser.Controller | |
| parent | 890069d312d3132391edf857730ffc9a34c9fce4 (diff) | |
| parent | adc22b5e811ff1d570946a65b94930c1c338c7d3 (diff) | |
Merge pull request #2870 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Controller')
| -rw-r--r-- | MediaBrowser.Controller/LiveTv/ILiveTvRecording.cs | 1 | ||||
| -rw-r--r-- | MediaBrowser.Controller/LiveTv/LiveTvProgram.cs | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/MediaBrowser.Controller/LiveTv/ILiveTvRecording.cs b/MediaBrowser.Controller/LiveTv/ILiveTvRecording.cs index 4b757f0b9b..ed3b74bf94 100644 --- a/MediaBrowser.Controller/LiveTv/ILiveTvRecording.cs +++ b/MediaBrowser.Controller/LiveTv/ILiveTvRecording.cs @@ -42,7 +42,6 @@ namespace MediaBrowser.Controller.LiveTv public string Id { get; set; } public string Path { get; set; } public TimerInfo Timer { get; set; } - public ProgramInfo Program { get; set; } public CancellationTokenSource CancellationTokenSource { get; set; } } } diff --git a/MediaBrowser.Controller/LiveTv/LiveTvProgram.cs b/MediaBrowser.Controller/LiveTv/LiveTvProgram.cs index 1607dbcba1..896615ad99 100644 --- a/MediaBrowser.Controller/LiveTv/LiveTvProgram.cs +++ b/MediaBrowser.Controller/LiveTv/LiveTvProgram.cs @@ -88,6 +88,9 @@ namespace MediaBrowser.Controller.LiveTv [IgnoreDataMember] public string EpisodeTitle { get; set; } + [IgnoreDataMember] + public string ShowId { get; set; } + /// <summary> /// Gets or sets a value indicating whether this instance is movie. /// </summary> |