diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-02-08 16:31:35 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-08 16:31:35 -0500 |
| commit | 1ec5e13cdc5d4ac953c5edea538824f9bfc5f718 (patch) | |
| tree | 6dbf2059273b9dfb5b98db0e8d07dd56844fcae6 | |
| parent | 52d496386fd6a042aa0812deea052fc563688585 (diff) | |
| parent | d6b4b5eeb080d67c1b10e4572af59a5e292e9aa0 (diff) | |
Merge pull request #2452 from MediaBrowser/dev
Dev
| -rw-r--r-- | Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs | 14 | ||||
| -rw-r--r-- | MediaBrowser.Api/LiveTv/LiveTvService.cs | 2 | ||||
| -rw-r--r-- | SharedVersion.cs | 2 |
3 files changed, 11 insertions, 7 deletions
diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs index fe114d224..cd5fd0c8c 100644 --- a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs +++ b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs @@ -469,16 +469,20 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV public ChannelInfo GetEpgChannelFromTunerChannel(List<NameValuePair> mappings, ChannelInfo tunerChannel, List<ChannelInfo> epgChannels) { - if (!string.IsNullOrWhiteSpace(tunerChannel.TunerChannelId)) + var tunerChannelId = string.IsNullOrWhiteSpace(tunerChannel.TunerChannelId) + ? tunerChannel.Id + : tunerChannel.TunerChannelId; + + if (!string.IsNullOrWhiteSpace(tunerChannelId)) { - var tunerChannelId = GetMappedChannel(tunerChannel.TunerChannelId, mappings); + var mappedTunerChannelId = GetMappedChannel(tunerChannelId, mappings); - if (string.IsNullOrWhiteSpace(tunerChannelId)) + if (string.IsNullOrWhiteSpace(mappedTunerChannelId)) { - tunerChannelId = tunerChannel.TunerChannelId; + mappedTunerChannelId = tunerChannelId; } - var channel = epgChannels.FirstOrDefault(i => string.Equals(tunerChannelId, i.Id, StringComparison.OrdinalIgnoreCase)); + var channel = epgChannels.FirstOrDefault(i => string.Equals(mappedTunerChannelId, i.Id, StringComparison.OrdinalIgnoreCase)); if (channel != null) { diff --git a/MediaBrowser.Api/LiveTv/LiveTvService.cs b/MediaBrowser.Api/LiveTv/LiveTvService.cs index 04983553b..909fc0623 100644 --- a/MediaBrowser.Api/LiveTv/LiveTvService.cs +++ b/MediaBrowser.Api/LiveTv/LiveTvService.cs @@ -791,7 +791,7 @@ namespace MediaBrowser.Api.LiveTv ProviderChannels = providerChannels.Select(i => new NameIdPair { Name = i.Name, - Id = i.TunerChannelId + Id = string.IsNullOrWhiteSpace(i.TunerChannelId) ? i.Id : i.TunerChannelId }).ToList(), diff --git a/SharedVersion.cs b/SharedVersion.cs index 794165849..f674ad453 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,3 +1,3 @@ using System.Reflection; -[assembly: AssemblyVersion("3.2.0.102")] +[assembly: AssemblyVersion("3.2.0.103")] |