1 files changed, 24 insertions, 22 deletions
diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
index aefb29f1a6..c828250074 100644
--- a/MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
+++ b/MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
@@ -54,14 +54,23 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.TV
         {
             if (args.IsDirectory)
             {
-                var collectionType = args.GetCollectionType();
-                if (string.Equals(collectionType, CollectionType.TvShows, StringComparison.OrdinalIgnoreCase))
+                if (args.HasParent<Series>() || args.HasParent<Season>())
+                {
+                    return null;
+                }
+
+                if (args.ContainsFileSystemEntryByName("tvshow.nfo"))
                 {
-                    if (args.HasParent<Series>())
+                    return new Series
                     {
-                        return null;
-                    }
+                        Path = args.Path,
+                        Name = Path.GetFileName(args.Path)
+                    };
+                }
 
+                var collectionType = args.GetCollectionType();
+                if (string.Equals(collectionType, CollectionType.TvShows, StringComparison.OrdinalIgnoreCase))
+                {
                     var configuredContentType = _libraryManager.GetConfiguredContentType(args.Path);
                     if (!string.Equals(configuredContentType, CollectionType.TvShows, StringComparison.OrdinalIgnoreCase))
                     {
@@ -72,27 +81,20 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.TV
                         };
                     }
                 }
-                else
+                else if (string.IsNullOrWhiteSpace(collectionType))
                 {
-                    if (string.IsNullOrWhiteSpace(collectionType))
+                    if (args.Parent.IsRoot)
                     {
-                        if (args.HasParent<Series>())
-                        {
-                            return null;
-                        }
+                        return null;
+                    }
 
-                        if (args.Parent.IsRoot)
-                        {
-                            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))
+                    {
+                        return new Series
                         {
-                            return new Series
-                            {
-                                Path = args.Path,
-                                Name = Path.GetFileName(args.Path)
-                            };
-                        }
+                            Path = args.Path,
+                            Name = Path.GetFileName(args.Path)
+                        };
                     }
                 }
             }