diff options
| author | crobibero <cody@robibe.ro> | 2020-09-03 10:37:35 -0600 |
|---|---|---|
| committer | crobibero <cody@robibe.ro> | 2020-09-03 10:37:35 -0600 |
| commit | b035a642d27ea4b0a22e9a539c641a055bac056b (patch) | |
| tree | 9b7ad34430d923a841a5789f49bb4dde2578c339 /MediaBrowser.Controller/Entities/AggregateFolder.cs | |
| parent | 5e6cdc8842c3c81eb7e0363e6d36fac6630304e1 (diff) | |
| parent | 645db0524fb1368135ecea9e5b776ad9b490b17b (diff) | |
Merge remote-tracking branch 'upstream/master' into plugin-install
Diffstat (limited to 'MediaBrowser.Controller/Entities/AggregateFolder.cs')
| -rw-r--r-- | MediaBrowser.Controller/Entities/AggregateFolder.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/MediaBrowser.Controller/Entities/AggregateFolder.cs b/MediaBrowser.Controller/Entities/AggregateFolder.cs index e1c800e61..6ebea5f44 100644 --- a/MediaBrowser.Controller/Entities/AggregateFolder.cs +++ b/MediaBrowser.Controller/Entities/AggregateFolder.cs @@ -1,3 +1,5 @@ +#pragma warning disable CS1591 + using System; using System.Collections.Concurrent; using System.Collections.Generic; @@ -57,6 +59,7 @@ namespace MediaBrowser.Controller.Entities private Guid[] _childrenIds = null; private readonly object _childIdsLock = new object(); + protected override List<BaseItem> LoadChildren() { lock (_childIdsLock) |