Merge pull request #4 from jellyfin/dev

Dev

1 files changed, 8 insertions, 6 deletions

diff --git a/MediaBrowser.Controller/Entities/CollectionFolder.cs b/MediaBrowser.Controller/Entities/CollectionFolder.cs
index 8240a68ff..7292b166a 100644
--- a/MediaBrowser.Controller/Entities/CollectionFolder.cs
+++ b/MediaBrowser.Controller/Entities/CollectionFolder.cs
@@ -1,13 +1,13 @@
-using MediaBrowser.Controller.IO;
-using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.Providers;
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
+using MediaBrowser.Controller.IO;
+using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Providers;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Entities;
@@ -15,6 +15,8 @@ using MediaBrowser.Model.Extensions;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Serialization;
 
+using Microsoft.Extensions.Logging;
+
 namespace MediaBrowser.Controller.Entities
 {
     /// <summary>
@@ -103,7 +105,7 @@ namespace MediaBrowser.Controller.Entities
             }
             catch (Exception ex)
             {
-                Logger.ErrorException("Error loading library options", ex);
+                Logger.LogError(ex, "Error loading library options");
 
                 return new LibraryOptions();
             }
@@ -275,7 +277,7 @@ namespace MediaBrowser.Controller.Entities
 
             var changed = !linkedChildren.SequenceEqual(LinkedChildren, new LinkedChildComparer(FileSystem));
 
-            LinkedChildren = linkedChildren.ToArray(linkedChildren.Count);
+            LinkedChildren = linkedChildren.ToArray();
 
             var folderIds = PhysicalFolderIds;
             var newFolderIds = physicalFolders.Select(i => i.Id).ToArray();