fix playlist deletion

1 files changed, 18 insertions, 9 deletions

diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
index c82825007..870e8b55a 100644
--- a/MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
+++ b/MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
@@ -59,18 +59,18 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.TV
                     return null;
                 }
 
-                if (args.ContainsFileSystemEntryByName("tvshow.nfo"))
-                {
-                    return new Series
-                    {
-                        Path = args.Path,
-                        Name = Path.GetFileName(args.Path)
-                    };
-                }
-
                 var collectionType = args.GetCollectionType();
                 if (string.Equals(collectionType, CollectionType.TvShows, StringComparison.OrdinalIgnoreCase))
                 {
+                    if (args.ContainsFileSystemEntryByName("tvshow.nfo"))
+                    {
+                        return new Series
+                        {
+                            Path = args.Path,
+                            Name = Path.GetFileName(args.Path)
+                        };
+                    }
+
                     var configuredContentType = _libraryManager.GetConfiguredContentType(args.Path);
                     if (!string.Equals(configuredContentType, CollectionType.TvShows, StringComparison.OrdinalIgnoreCase))
                     {
@@ -83,6 +83,15 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.TV
                 }
                 else if (string.IsNullOrWhiteSpace(collectionType))
                 {
+                    if (args.ContainsFileSystemEntryByName("tvshow.nfo"))
+                    {
+                        return new Series
+                        {
+                            Path = args.Path,
+                            Name = Path.GetFileName(args.Path)
+                        };
+                    }
+
                     if (args.Parent.IsRoot)
                     {
                         return null;