diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-09-15 22:43:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-15 22:43:46 -0400 |
| commit | 191259893646ba9afc5af89685ec4e8f26648cbd (patch) | |
| tree | 11f24aa5b41cc82bac2c945a67bc8e5ca1854dd6 /MediaBrowser.Server.Implementations/Library | |
| parent | a741e5000930899424bae79c4ac7737f41dacf24 (diff) | |
| parent | 7177512a4551201d721a64ebc8f1fbe15266b6de (diff) | |
Merge pull request #2174 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Server.Implementations/Library')
| -rw-r--r-- | MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs index 4c6254330..207486f26 100644 --- a/MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs +++ b/MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs @@ -54,7 +54,7 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.TV { if (args.IsDirectory) { - if (args.HasParent<Series>()) + if (args.HasParent<Series>() || args.HasParent<Season>()) { return null; } @@ -80,7 +80,8 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.TV { return null; } - if (IsSeriesFolder(args.Path, args.FileSystemChildren, args.DirectoryService, _fileSystem, _logger, _libraryManager, args.GetLibraryOptions(), false)) + if (IsSeriesFolder(args.Path, args.FileSystemChildren, args.DirectoryService, _fileSystem, _logger, _libraryManager, args.GetLibraryOptions(), false) || + args.ContainsFileSystemEntryByName("tvshow.nfo")) { return new Series { |