From 9d40b684bf6af4e987e226c78c11d6daf6f5cd9b Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 22 Jan 2014 12:05:06 -0500 Subject: #680 - episode organization --- .../Library/Resolvers/TV/EpisodeResolver.cs | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'MediaBrowser.Server.Implementations/Library/Resolvers') diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/TV/EpisodeResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/TV/EpisodeResolver.cs index 420c9f583..d8af92991 100644 --- a/MediaBrowser.Server.Implementations/Library/Resolvers/TV/EpisodeResolver.cs +++ b/MediaBrowser.Server.Implementations/Library/Resolvers/TV/EpisodeResolver.cs @@ -19,20 +19,23 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.TV protected override Episode Resolve(ItemResolveArgs args) { var parent = args.Parent; + + if (parent == null) + { + return null; + } + var season = parent as Season; // Just in case the user decided to nest episodes. // Not officially supported but in some cases we can handle it. if (season == null) { - if (parent != null) - { - season = parent.Parents.OfType().FirstOrDefault(); - } + season = parent.Parents.OfType().FirstOrDefault(); } // If the parent is a Season or Series, then this is an Episode if the VideoResolver returns something - if (season != null || args.Parent is Series) + if (season != null || parent.Parents.OfType().Any()) { Episode episode = null; -- cgit v1.2.3