diff options
| author | crobibero <cody@robibe.ro> | 2020-06-16 18:30:10 -0600 |
|---|---|---|
| committer | crobibero <cody@robibe.ro> | 2020-06-16 18:30:10 -0600 |
| commit | a639663aa78405644a02fbdd25411874b6cb2ab4 (patch) | |
| tree | f5601fd9f3c9f07f5991fdf4ee1ff2c8d795ac34 /MediaBrowser.Controller/Entities/AggregateFolder.cs | |
| parent | 7b54a43cc11964bffd9eaf8bad79a28b5845cc9c (diff) | |
| parent | 215ab39e00be3a79875351a76f0d836a9281ce6b (diff) | |
Merge remote-tracking branch 'upstream/master' into warning-local-metadata
Diffstat (limited to 'MediaBrowser.Controller/Entities/AggregateFolder.cs')
| -rw-r--r-- | MediaBrowser.Controller/Entities/AggregateFolder.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/MediaBrowser.Controller/Entities/AggregateFolder.cs b/MediaBrowser.Controller/Entities/AggregateFolder.cs index 54540e892..e1c800e61 100644 --- a/MediaBrowser.Controller/Entities/AggregateFolder.cs +++ b/MediaBrowser.Controller/Entities/AggregateFolder.cs @@ -35,7 +35,7 @@ namespace MediaBrowser.Controller.Entities public override bool SupportsPlayedStatus => false; /// <summary> - /// The _virtual children + /// The _virtual children. /// </summary> private readonly ConcurrentBag<BaseItem> _virtualChildren = new ConcurrentBag<BaseItem>(); @@ -195,6 +195,7 @@ namespace MediaBrowser.Controller.Entities return child; } } + return null; } } |
