diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-10-14 12:25:21 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-14 12:25:21 -0400 |
| commit | 68d52b85d132e22bcfda72ca0c4c3edbd9f3fbd7 (patch) | |
| tree | 8f18bb944460bd7fbe05e072eb67a484248146ca /MediaBrowser.Server.Implementations/LiveTv | |
| parent | 1c169b5b407c662a8ac0aa0f10bd37ce72e62901 (diff) | |
| parent | 360e666cc630c2200111a68f027c0ef6a176f73a (diff) | |
Merge pull request #2233 from MediaBrowser/dev
update recording dialogs
Diffstat (limited to 'MediaBrowser.Server.Implementations/LiveTv')
| -rw-r--r-- | MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs index 86d77982c..2e58c6b30 100644 --- a/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs +++ b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs @@ -741,7 +741,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV { PostPaddingSeconds = Math.Max(config.PostPaddingSeconds, 0), PrePaddingSeconds = Math.Max(config.PrePaddingSeconds, 0), - RecordAnyChannel = true, + RecordAnyChannel = false, RecordAnyTime = true, RecordNewOnly = true, diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs b/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs index c07c448db..38eb9bdd1 100644 --- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs +++ b/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs @@ -114,8 +114,8 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts channel.ImageUrl = FindProperty("tvg-logo", extInf, null); channel.Number = FindProperty("channel-id", extInf, channel.Number); channel.Number = FindProperty("tvg-id", extInf, channel.Number); - channel.Name = FindProperty("tvg-name", extInf, channel.Name); channel.Name = FindProperty("tvg-id", extInf, channel.Name); + channel.Name = FindProperty("tvg-name", extInf, channel.Name); return channel; } |