diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-09-03 13:19:49 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-03 13:19:49 -0400 |
| commit | c9ba91d7a5219180d237532a936ca3c742c76a61 (patch) | |
| tree | 50b78c48ec58db7b69b0f26a42f38ac6c8a135d3 /MediaBrowser.Server.Implementations/Library | |
| parent | f12204c6d54f8de8978e1c235674b17b1b0b0ad7 (diff) | |
| parent | 2d7c82d0dd8b51af58a2e187ef30639fdbfd918a (diff) | |
Merge pull request #2137 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Server.Implementations/Library')
| -rw-r--r-- | MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs index aefb29f1a..4c6254330 100644 --- a/MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs +++ b/MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs @@ -54,14 +54,14 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.TV { if (args.IsDirectory) { + if (args.HasParent<Series>()) + { + return null; + } + var collectionType = args.GetCollectionType(); if (string.Equals(collectionType, CollectionType.TvShows, StringComparison.OrdinalIgnoreCase)) { - if (args.HasParent<Series>()) - { - return null; - } - var configuredContentType = _libraryManager.GetConfiguredContentType(args.Path); if (!string.Equals(configuredContentType, CollectionType.TvShows, StringComparison.OrdinalIgnoreCase)) { @@ -76,11 +76,6 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.TV { if (string.IsNullOrWhiteSpace(collectionType)) { - if (args.HasParent<Series>()) - { - return null; - } - if (args.Parent.IsRoot) { return null; |
