diff options
| author | Max Git <rotvel@gmail.com> | 2020-06-17 02:52:38 +0200 |
|---|---|---|
| committer | Max Git <rotvel@gmail.com> | 2020-06-17 02:52:38 +0200 |
| commit | 33f78df051da8d10b2dac0b5d9377a84d868be51 (patch) | |
| tree | ec707c55c6e3474fbb0ebafdbae50e8b93d71e87 /MediaBrowser.Controller/Entities/AggregateFolder.cs | |
| parent | e6c197b96991a619d58e816ee56c23644c4a1de1 (diff) | |
| parent | 215ab39e00be3a79875351a76f0d836a9281ce6b (diff) | |
Merge branch 'master' into feature/ffmpeg-version-check
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; } } |
