From 6247929a62790ececc76864acc75f7ac47ee18aa Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Tue, 3 Dec 2013 16:12:20 -0500
Subject: #643 - Support episodes directly in series folder

---
 .../Library/Resolvers/TV/EpisodeResolver.cs                      | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/Library')

diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/TV/EpisodeResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/TV/EpisodeResolver.cs
index 0a6a72fc1..693594a20 100644
--- a/MediaBrowser.Server.Implementations/Library/Resolvers/TV/EpisodeResolver.cs
+++ b/MediaBrowser.Server.Implementations/Library/Resolvers/TV/EpisodeResolver.cs
@@ -20,7 +20,7 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.TV
             var season = args.Parent as Season;
 
             // If the parent is a Season or Series, then this is an Episode if the VideoResolver returns something
-            if (season != null)
+            if (season != null || args.Parent is Series)
             {
                 Episode episode = null;
 
@@ -51,8 +51,11 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.TV
 
                 if (episode != null)
                 {
-                    episode.ParentIndexNumber = season.IndexNumber;
-                    
+                    if (season != null)
+                    {
+                        episode.ParentIndexNumber = season.IndexNumber;
+                    }
+
                     if (episode.ParentIndexNumber == null)
                     {
                         episode.ParentIndexNumber = TVUtils.GetSeasonNumberFromEpisodeFile(args.Path);
-- 
cgit v1.2.3