diff options
| author | Bond-009 <bond.009@outlook.com> | 2020-06-18 17:01:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-18 17:01:15 +0200 |
| commit | a3c0b8a826b0f226a4e7a9aa1de6a8cb44dd22d3 (patch) | |
| tree | d2284787df9647ee49e6aad3fa21fc2ed1d996ea /MediaBrowser.Controller/Entities/AggregateFolder.cs | |
| parent | 6b959f40ac208094da0a1d41d8c8a42df9a87876 (diff) | |
| parent | fbefddbb816319a77bdf96d1c2216609bef13081 (diff) | |
Merge branch 'master' into buffer
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; } } |
