diff options
| author | BaronGreenback <jimcartlidge@yahoo.co.uk> | 2020-10-14 19:05:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-14 19:05:57 +0100 |
| commit | 5b8349b4426b2eaa5ac812bf86a89eb3febd2c40 (patch) | |
| tree | 893d00fddfdd52ba1ff69f56e3d2d5bce1bdb74a /MediaBrowser.Controller/Entities/Folder.cs | |
| parent | a8cee0bd36278035135bf871f25c126a12fde9ef (diff) | |
| parent | d54de29485cc622a64c17884b39c9bc65e33af29 (diff) | |
Merge branch 'master' into fordiscussion
Diffstat (limited to 'MediaBrowser.Controller/Entities/Folder.cs')
| -rw-r--r-- | MediaBrowser.Controller/Entities/Folder.cs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs index 11542c1ca..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) @@ -1386,7 +1388,6 @@ namespace MediaBrowser.Controller.Entities } } - /// <summary> /// Gets the linked children. /// </summary> @@ -1594,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) { |