aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller/Entities/Folder.cs
diff options
context:
space:
mode:
authorJoshua M. Boniface <joshua@boniface.me>2018-12-30 01:04:27 -0500
committerGitHub <noreply@github.com>2018-12-30 01:04:27 -0500
commit76b647e0a8eddd65dc9c4de7b887a3faf6e12bcc (patch)
treea0fcc6a59c597f7c288dd3619c7e72bf97d2e0ea /MediaBrowser.Controller/Entities/Folder.cs
parenta86b71899ec52c44ddc6c3018e8cc5e9d7ff4d62 (diff)
parentd10d632c489b94566bbcf1b7e9c2bb86c31c97b1 (diff)
Merge pull request #325 from jellyfin/devv3.5.2-5
Master 3.5.2-5
Diffstat (limited to 'MediaBrowser.Controller/Entities/Folder.cs')
-rw-r--r--MediaBrowser.Controller/Entities/Folder.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index 8b9aa5fc3..81072b6e7 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -914,7 +914,7 @@ namespace MediaBrowser.Controller.Entities
// Try to preserve order
return result.OrderBy(i => ids.IndexOf(i.Id)).ToArray();
}
- return result.ToArray(result.Count);
+ return result.ToArray();
}
return GetItemsInternal(query).Items;
@@ -1608,7 +1608,7 @@ namespace MediaBrowser.Controller.Entities
Logger.Info("Shortcut links have changed for {0}", Path);
newShortcutLinks.AddRange(LinkedChildren.Where(i => i.Type == LinkedChildType.Manual));
- LinkedChildren = newShortcutLinks.ToArray(newShortcutLinks.Count);
+ LinkedChildren = newShortcutLinks.ToArray();
return true;
}
}