diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-08-05 15:05:30 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-05 15:05:30 -0400 |
| commit | d8c2dd253277ba2ce7a5a7496b278db0e4e85106 (patch) | |
| tree | 176e34705fb03d79d9302cf7f8f8aa3f88958cca /Emby.Server.Implementations/LiveTv | |
| parent | e169eaee6cb2f91e4102f4fe7ac9075659feba95 (diff) | |
| parent | 804f19fc424e72ede16e66bc7809eab3450e528e (diff) | |
Merge pull request #2795 from MediaBrowser/dev
Dev
Diffstat (limited to 'Emby.Server.Implementations/LiveTv')
| -rw-r--r-- | Emby.Server.Implementations/LiveTv/LiveTvManager.cs | 4 | ||||
| -rw-r--r-- | Emby.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/Emby.Server.Implementations/LiveTv/LiveTvManager.cs b/Emby.Server.Implementations/LiveTv/LiveTvManager.cs index 10aab4054a..48c74681f6 100644 --- a/Emby.Server.Implementations/LiveTv/LiveTvManager.cs +++ b/Emby.Server.Implementations/LiveTv/LiveTvManager.cs @@ -1957,7 +1957,7 @@ namespace Emby.Server.Implementations.LiveTv if (dto.MediaSources == null) { - dto.MediaSources = recording.GetMediaSources(true).ToList(); + dto.MediaSources = recording.GetMediaSources(true); } if (dto.MediaStreams == null) @@ -2365,7 +2365,7 @@ namespace Emby.Server.Implementations.LiveTv if (addMediaSources) { - dto.MediaSources = channel.GetMediaSources(true).ToList(); + dto.MediaSources = channel.GetMediaSources(true); } if (addCurrentProgram) diff --git a/Emby.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs b/Emby.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs index 919c0f10d6..a7e69776c8 100644 --- a/Emby.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs +++ b/Emby.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs @@ -78,8 +78,7 @@ namespace Emby.Server.Implementations.LiveTv { var hasMediaSources = (IHasMediaSources)item; - sources = _mediaSourceManager.GetStaticMediaSources(hasMediaSources, false) - .ToList(); + sources = _mediaSourceManager.GetStaticMediaSources(hasMediaSources, false); forceRequireOpening = true; } |