diff options
Diffstat (limited to 'MediaBrowser.Controller')
| -rw-r--r-- | MediaBrowser.Controller/Drawing/ImageProcessingOptions.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Entities/CollectionFolder.cs | 8 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Entities/Folder.cs | 7 |
3 files changed, 9 insertions, 8 deletions
diff --git a/MediaBrowser.Controller/Drawing/ImageProcessingOptions.cs b/MediaBrowser.Controller/Drawing/ImageProcessingOptions.cs index b639d0b9c..3c2e6ab37 100644 --- a/MediaBrowser.Controller/Drawing/ImageProcessingOptions.cs +++ b/MediaBrowser.Controller/Drawing/ImageProcessingOptions.cs @@ -35,6 +35,6 @@ namespace MediaBrowser.Controller.Drawing public ImageOutputFormat OutputFormat { get; set; } - public ImageOverlay Indicator { get; set; } + public ImageOverlay? Indicator { get; set; } } } diff --git a/MediaBrowser.Controller/Entities/CollectionFolder.cs b/MediaBrowser.Controller/Entities/CollectionFolder.cs index bc50ce618..f032d9318 100644 --- a/MediaBrowser.Controller/Entities/CollectionFolder.cs +++ b/MediaBrowser.Controller/Entities/CollectionFolder.cs @@ -65,6 +65,8 @@ namespace MediaBrowser.Controller.Entities IndexCache.Clear(); } + ResetDynamicChildren(); + return NullTaskResult; } @@ -99,7 +101,8 @@ namespace MediaBrowser.Controller.Entities return LibraryManager.RootFolder.Children .OfType<Folder>() .Where(i => i.Path != null && locationsDicionary.ContainsKey(i.Path)) - .SelectMany(c => c.LinkedChildren).ToList(); + .SelectMany(c => c.LinkedChildren) + .ToList(); } private IEnumerable<BaseItem> _actualChildren; @@ -131,7 +134,8 @@ namespace MediaBrowser.Controller.Entities LibraryManager.RootFolder.Children .OfType<Folder>() .Where(i => i.Path != null && locationsDicionary.ContainsKey(i.Path)) - .SelectMany(c => c.Children); + .SelectMany(c => c.Children) + .ToList(); } public void ResetDynamicChildren() diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs index fba873251..855bbb205 100644 --- a/MediaBrowser.Controller/Entities/Folder.cs +++ b/MediaBrowser.Controller/Entities/Folder.cs @@ -99,7 +99,7 @@ namespace MediaBrowser.Controller.Entities item.DateModified = DateTime.UtcNow; } - _children.Add(item); + AddChildrenInternal(new[] { item }); await LibraryManager.CreateItem(item, cancellationToken).ConfigureAwait(false); @@ -728,10 +728,7 @@ namespace MediaBrowser.Controller.Entities if (actualRemovals.Count > 0) { - lock (ChildrenSyncLock) - { - _children = new ConcurrentBag<BaseItem>(_children.Except(actualRemovals)); - } + RemoveChildrenInternal(actualRemovals); } await LibraryManager.CreateItems(newItems, cancellationToken).ConfigureAwait(false); |