diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-10-15 18:17:32 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-15 18:17:32 -0400 |
| commit | 69f5c28badec8d86cfd368ae28cdfc095628b2fc (patch) | |
| tree | 00b58b39e0c9adc8b7ad834fa36063f8835f6672 /MediaBrowser.Server.Implementations/LiveTv | |
| parent | 3d1db18b07367c18b172babba11a27ec48902674 (diff) | |
| parent | ac2ca1fec211d7793c3cacc219204515aa4defe8 (diff) | |
Merge pull request #2236 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Server.Implementations/LiveTv')
| -rw-r--r-- | MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs index bac9789b5..aa404b37c 100644 --- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs +++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs @@ -1752,7 +1752,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv public async Task AddInfoToProgramDto(List<Tuple<BaseItem, BaseItemDto>> tuples, List<ItemFields> fields, User user = null) { - var recordingTuples = new List<Tuple<BaseItemDto, string, string, string>>(); + var programTuples = new List<Tuple<BaseItemDto, string, string, string>>(); foreach (var tuple in tuples) { @@ -1812,18 +1812,17 @@ namespace MediaBrowser.Server.Implementations.LiveTv } } - var service = GetService(program); - var serviceName = service == null ? null : service.Name; + var serviceName = program.ServiceName; if (fields.Contains(ItemFields.ServiceName)) { dto.ServiceName = serviceName; } - recordingTuples.Add(new Tuple<BaseItemDto, string, string, string>(dto, serviceName, program.ExternalId, program.ExternalSeriesIdLegacy)); + programTuples.Add(new Tuple<BaseItemDto, string, string, string>(dto, serviceName, program.ExternalId, program.ExternalSeriesIdLegacy)); } - await AddRecordingInfo(recordingTuples, CancellationToken.None).ConfigureAwait(false); + await AddRecordingInfo(programTuples, CancellationToken.None).ConfigureAwait(false); } public void AddInfoToRecordingDto(BaseItem item, BaseItemDto dto, User user = null) |
