aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller/Entities/AggregateFolder.cs
diff options
context:
space:
mode:
authorMark Monteiro <marknr.monteiro@protonmail.com>2020-06-26 10:12:22 -0400
committerMark Monteiro <marknr.monteiro@protonmail.com>2020-06-26 10:12:22 -0400
commit0e9164351b80b532b96fbf4edf98dbd483141183 (patch)
treea0c399755abe3f32943b77422e67927d99b5120e /MediaBrowser.Controller/Entities/AggregateFolder.cs
parent4f6e5591ece8d9344385d13f923384abfc07b709 (diff)
parent57caa9fdba984d0c4813c642f2617be905205d49 (diff)
Merge remote-tracking branch 'upstream/master' into external-id-type
Diffstat (limited to 'MediaBrowser.Controller/Entities/AggregateFolder.cs')
-rw-r--r--MediaBrowser.Controller/Entities/AggregateFolder.cs3
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;
}
}