diff options
| author | crobibero <cody@robibe.ro> | 2020-10-27 13:25:57 -0600 |
|---|---|---|
| committer | crobibero <cody@robibe.ro> | 2020-10-27 13:25:57 -0600 |
| commit | 4558c192c76e153d752a1aacdd965525430023b5 (patch) | |
| tree | dfb7a5d479f82db7a99eae57722599530d8504ad /MediaBrowser.Controller/Entities/Folder.cs | |
| parent | 163d6b0f1d1a252e85b8776b4b0c2ccaa611667e (diff) | |
| parent | be2f27a0695e5f3102f79a2e246e971682cff603 (diff) | |
Merge remote-tracking branch 'upstream/master' into query-image-type
Diffstat (limited to 'MediaBrowser.Controller/Entities/Folder.cs')
| -rw-r--r-- | MediaBrowser.Controller/Entities/Folder.cs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs index 901ea875b..35ddaffad 100644 --- a/MediaBrowser.Controller/Entities/Folder.cs +++ b/MediaBrowser.Controller/Entities/Folder.cs @@ -255,7 +255,8 @@ namespace MediaBrowser.Controller.Entities var id = child.Id; if (dictionary.ContainsKey(id)) { - Logger.LogError("Found folder containing items with duplicate id. Path: {path}, Child Name: {ChildName}", + Logger.LogError( + "Found folder containing items with duplicate id. Path: {path}, Child Name: {ChildName}", Path ?? Name, child.Path ?? child.Name); } @@ -984,7 +985,8 @@ namespace MediaBrowser.Controller.Entities return items; } - private static bool CollapseBoxSetItems(InternalItemsQuery query, + private static bool CollapseBoxSetItems( + InternalItemsQuery query, BaseItem queryParent, User user, IServerConfigurationManager configurationManager) @@ -1593,7 +1595,8 @@ namespace MediaBrowser.Controller.Entities /// <param name="datePlayed">The date played.</param> /// <param name="resetPosition">if set to <c>true</c> [reset position].</param> /// <returns>Task.</returns> - public override void MarkPlayed(User user, + public override void MarkPlayed( + User user, DateTime? datePlayed, bool resetPosition) { |