diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-11-04 14:04:23 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-11-04 14:04:23 -0500 |
| commit | 9ba615e64948de7f377c4ec6bb7967744b4fd029 (patch) | |
| tree | cdd21f521d856e0c0becdc21d718571211d7aec8 /MediaBrowser.Controller | |
| parent | 4b886ea93f3a9c295ff1da36a6cdf33c677de5e5 (diff) | |
fixes #606 - Add manual image selection for Seasons
Diffstat (limited to 'MediaBrowser.Controller')
| -rw-r--r-- | MediaBrowser.Controller/Entities/Folder.cs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs index 7b335b719..dbed0b489 100644 --- a/MediaBrowser.Controller/Entities/Folder.cs +++ b/MediaBrowser.Controller/Entities/Folder.cs @@ -718,7 +718,7 @@ namespace MediaBrowser.Controller.Entities { var newChildren = validChildren.Select(c => c.Item1).ToList(); - //that's all the new and changed ones - now see if there are any that are missing + // That's all the new and changed ones - now see if there are any that are missing var itemsRemoved = currentChildren.Values.Except(newChildren).ToList(); var actualRemovals = new List<BaseItem>(); @@ -936,13 +936,14 @@ namespace MediaBrowser.Controller.Entities /// <returns>IEnumerable{BaseItem}.</returns> protected virtual IEnumerable<BaseItem> GetNonCachedChildren() { + var resolveArgs = ResolveArgs; - if (ResolveArgs == null || ResolveArgs.FileSystemDictionary == null) + if (resolveArgs == null || resolveArgs.FileSystemDictionary == null) { - Logger.Error("Null for {0}", Path); + Logger.Error("ResolveArgs null for {0}", Path); } - return LibraryManager.ResolvePaths<BaseItem>(ResolveArgs.FileSystemChildren, this); + return LibraryManager.ResolvePaths<BaseItem>(resolveArgs.FileSystemChildren, this); } /// <summary> |
