diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-12-09 21:02:33 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-09 21:02:33 -0500 |
| commit | c79706efe543199c7efdaef2bc2afd8dfb9b5e61 (patch) | |
| tree | dcb5dee8328bc50978ec09fb3075d5244faad165 /Emby.Server.Implementations/LiveTv | |
| parent | 003650f2d669d68cd382281daa2d3af8a1a02d30 (diff) | |
| parent | e936f49518bcd6e28d44600d58205fee9c1e21fd (diff) | |
Merge pull request #2334 from MediaBrowser/dev
Dev
Diffstat (limited to 'Emby.Server.Implementations/LiveTv')
3 files changed, 4 insertions, 4 deletions
diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs index 4e2b3f661..f5bef058d 100644 --- a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs +++ b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs @@ -1573,7 +1573,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV ErrorDialog = false, FileName = options.RecordingPostProcessor, IsHidden = true, - UseShellExecute = true + UseShellExecute = false }); _logger.Info("Running recording post processor {0} {1}", process.StartInfo.FileName, process.StartInfo.Arguments); diff --git a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs index 7beaed338..04fc78c95 100644 --- a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs +++ b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs @@ -213,7 +213,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings { ScheduleDirect.Station station; - if (channelPair.TryGetValue(channelNumber, out station)) + if (!string.IsNullOrWhiteSpace(channelNumber) && channelPair.TryGetValue(channelNumber, out station)) { return station; } diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs index 19454abbc..8027ce2dd 100644 --- a/Emby.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs +++ b/Emby.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs @@ -149,8 +149,8 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts } }, - RequiresOpening = false, - RequiresClosing = false, + RequiresOpening = true, + RequiresClosing = true, ReadAtNativeFramerate = false, |