diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-12-29 21:41:22 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-12-29 21:41:22 -0500 |
| commit | 858be5d7885587320b389328484bbdf102fc9363 (patch) | |
| tree | f6342fc772592e0328093a4c2bf73c273c682a01 /MediaBrowser.Controller | |
| parent | 8c34f863fb6c6c282a87837138b3d620170099d8 (diff) | |
update built in studio images
Diffstat (limited to 'MediaBrowser.Controller')
| -rw-r--r-- | MediaBrowser.Controller/Entities/BaseItem.cs | 5 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Entities/Folder.cs | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs index a02369b2c..11562b3d7 100644 --- a/MediaBrowser.Controller/Entities/BaseItem.cs +++ b/MediaBrowser.Controller/Entities/BaseItem.cs @@ -1135,6 +1135,11 @@ namespace MediaBrowser.Controller.Entities { throw new ArgumentNullException(); } + if (IsInMixedFolder != copy.IsInMixedFolder) + { + Logger.Debug(Name + " changed due to different value for IsInMixedFolder."); + return true; + } var changed = copy.DateModified != DateModified; if (changed) diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs index fed206a30..912b8fa93 100644 --- a/MediaBrowser.Controller/Entities/Folder.cs +++ b/MediaBrowser.Controller/Entities/Folder.cs @@ -413,6 +413,7 @@ namespace MediaBrowser.Controller.Entities EntityResolutionHelper.EnsureDates(FileSystem, currentChild, child.ResolveArgs, false); } + currentChild.IsInMixedFolder = child.IsInMixedFolder; validChildren.Add(new Tuple<BaseItem, bool>(currentChild, true)); } else |