Merge pull request #2333 from MediaBrowser/dev

Dev

1 files changed, 11 insertions, 1 deletions

diff --git a/MediaBrowser.Controller/Entities/TV/Episode.cs b/MediaBrowser.Controller/Entities/TV/Episode.cs
index 2bcccf5e8b..737257898d 100644
--- a/MediaBrowser.Controller/Entities/TV/Episode.cs
+++ b/MediaBrowser.Controller/Entities/TV/Episode.cs
@@ -3,6 +3,7 @@ using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Entities;
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using MediaBrowser.Model.Serialization;
 
@@ -184,7 +185,16 @@ namespace MediaBrowser.Controller.Entities.TV
 
         public string FindSeasonName()
         {

-            var season = Season;

+            var season = Season;
+
+            if (season == null)
+            {
+                if (ParentIndexNumber.HasValue)
+                {
+                    return "Season " + ParentIndexNumber.Value.ToString(CultureInfo.InvariantCulture);
+                }

+            }

+

             return season == null ? SeasonName : season.Name;

         }