Merge pull request #2869 from MediaBrowser/dev

Dev

1 files changed, 28 insertions, 0 deletions

diff --git a/MediaBrowser.Controller/Entities/Movies/BoxSet.cs b/MediaBrowser.Controller/Entities/Movies/BoxSet.cs
index 900e8a6646..bd8d9024d4 100644
--- a/MediaBrowser.Controller/Entities/Movies/BoxSet.cs
+++ b/MediaBrowser.Controller/Entities/Movies/BoxSet.cs
@@ -80,16 +80,44 @@ namespace MediaBrowser.Controller.Entities.Movies
 
         protected override IEnumerable<BaseItem> GetNonCachedChildren(IDirectoryService directoryService)
         {
+            if (IsLegacyBoxSet)
+            {
+                return base.GetNonCachedChildren(directoryService);
+            }
             return new List<BaseItem>();
         }
 
         protected override List<BaseItem> LoadChildren()
         {
+            if (IsLegacyBoxSet)
+            {
+                return base.LoadChildren();
+            }
+
             // Save a trip to the database
             return new List<BaseItem>();
         }
 
         [IgnoreDataMember]
+        private bool IsLegacyBoxSet
+        {
+            get
+            {
+                if (string.IsNullOrWhiteSpace(Path))
+                {
+                    return false;
+                }
+
+                if (LinkedChildren.Length > 0)
+                {
+                    return false;
+                }
+
+                return !FileSystem.ContainsSubPath(ConfigurationManager.ApplicationPaths.DataPath, Path);
+            }
+        }
+
+        [IgnoreDataMember]
         public override bool IsPreSorted
         {
             get