diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-06-03 03:37:25 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-03 03:37:25 -0400 |
| commit | 69f00aef741b27b352eab94b5a059f5fd92a6160 (patch) | |
| tree | acbd6cee9beb5f38a4c21e8cdd485cee2a5f6f7c /MediaBrowser.Controller/Entities/AggregateFolder.cs | |
| parent | b54b7871e39e197d4af19a6c502938fa6178c4fa (diff) | |
| parent | 7fbea5d96d9df7b5e487c534ad5c37d54d2105ea (diff) | |
Merge pull request #2687 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Controller/Entities/AggregateFolder.cs')
| -rw-r--r-- | MediaBrowser.Controller/Entities/AggregateFolder.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MediaBrowser.Controller/Entities/AggregateFolder.cs b/MediaBrowser.Controller/Entities/AggregateFolder.cs index fe8ac0919..e8ebbdb70 100644 --- a/MediaBrowser.Controller/Entities/AggregateFolder.cs +++ b/MediaBrowser.Controller/Entities/AggregateFolder.cs @@ -87,7 +87,7 @@ namespace MediaBrowser.Controller.Entities private List<Guid> _childrenIds = null; private readonly object _childIdsLock = new object(); - protected override IEnumerable<BaseItem> LoadChildren() + protected override List<BaseItem> LoadChildren() { lock (_childIdsLock) { |