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/Library | |
| parent | 3d1db18b07367c18b172babba11a27ec48902674 (diff) | |
| parent | ac2ca1fec211d7793c3cacc219204515aa4defe8 (diff) | |
Merge pull request #2236 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Server.Implementations/Library')
| -rw-r--r-- | MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs | 1 | ||||
| -rw-r--r-- | MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs b/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs index e7bfe56f2..716d627a9 100644 --- a/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs +++ b/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs @@ -360,6 +360,7 @@ namespace MediaBrowser.Server.Implementations.Library public async Task<LiveStreamResponse> OpenLiveStream(LiveStreamRequest request, bool enableAutoClose, CancellationToken cancellationToken) { + enableAutoClose = false; await _liveStreamSemaphore.WaitAsync(cancellationToken).ConfigureAwait(false); try diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs index 1e480e265..3217cd67b 100644 --- a/MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs +++ b/MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs @@ -85,6 +85,12 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.TV { if (args.ContainsFileSystemEntryByName("tvshow.nfo")) { + if (args.Parent.IsRoot) + { + // For now, return null, but if we want to allow this in the future then add some additional checks to guard against a misplaced tvshow.nfo + return null; + } + return new Series { Path = args.Path, |