2 files changed, 5 insertions, 26 deletions
diff --git a/MediaBrowser.Controller/Library/ILibraryManager.cs b/MediaBrowser.Controller/Library/ILibraryManager.cs
index 025254d4b..cd1781220 100644
--- a/MediaBrowser.Controller/Library/ILibraryManager.cs
+++ b/MediaBrowser.Controller/Library/ILibraryManager.cs
@@ -277,7 +277,7 @@ namespace MediaBrowser.Controller.Library
         /// </summary>
         /// <param name="paths">The paths.</param>
         /// <returns>IEnumerable{System.String}.</returns>
-        IEnumerable<FileSystemMetadata> NormalizeRootPathList(IEnumerable<FileSystemMetadata> paths);
+        List<FileSystemMetadata> NormalizeRootPathList(IEnumerable<FileSystemMetadata> paths);
 
         /// <summary>
         /// Registers the item.
diff --git a/MediaBrowser.Controller/Library/ItemResolveArgs.cs b/MediaBrowser.Controller/Library/ItemResolveArgs.cs
index 76b6d8768..963e4b71b 100644
--- a/MediaBrowser.Controller/Library/ItemResolveArgs.cs
+++ b/MediaBrowser.Controller/Library/ItemResolveArgs.cs
@@ -40,20 +40,7 @@ namespace MediaBrowser.Controller.Library
         /// Gets the file system children.
         /// </summary>
         /// <value>The file system children.</value>
-        public IEnumerable<FileSystemMetadata> FileSystemChildren
-        {
-            get
-            {
-                var dict = FileSystemDictionary;
-
-                if (dict == null)
-                {
-                    return new List<FileSystemMetadata>();
-                }
-
-                return dict.Values;
-            }
-        }
+        public FileSystemMetadata[] FileSystemChildren { get; set; }
 
         public LibraryOptions LibraryOptions { get; set; }
 
@@ -63,12 +50,6 @@ namespace MediaBrowser.Controller.Library
         }
 
         /// <summary>
-        /// Gets or sets the file system dictionary.
-        /// </summary>
-        /// <value>The file system dictionary.</value>
-        public Dictionary<string, FileSystemMetadata> FileSystemDictionary { get; set; }
-
-        /// <summary>
         /// Gets or sets the parent.
         /// </summary>
         /// <value>The parent.</value>
@@ -224,13 +205,11 @@ namespace MediaBrowser.Controller.Library
                 throw new ArgumentNullException();
             }
 
-            if (FileSystemDictionary != null)
+            foreach (var file in FileSystemChildren)
             {
-                FileSystemMetadata entry;
-
-                if (FileSystemDictionary.TryGetValue(path, out entry))
+                if (string.Equals(file.FullName, path, StringComparison.Ordinal))
                 {
-                    return entry;
+                    return file;
                 }
             }