Merge pull request #2815 from MediaBrowser/beta

Beta

1 files changed, 14 insertions, 3 deletions

diff --git a/MediaBrowser.Controller/IO/FileData.cs b/MediaBrowser.Controller/IO/FileData.cs
index 97b778d0c..64a7610fe 100644
--- a/MediaBrowser.Controller/IO/FileData.cs
+++ b/MediaBrowser.Controller/IO/FileData.cs
@@ -13,6 +13,17 @@ namespace MediaBrowser.Controller.IO
     /// </summary>
     public static class FileData
     {
+        private static Dictionary<string, FileSystemMetadata> GetFileSystemDictionary(FileSystemMetadata[] list)
+        {
+            var dict = new Dictionary<string, FileSystemMetadata>(StringComparer.OrdinalIgnoreCase);
+
+            foreach (var file in list)
+            {
+                dict[file.FullName] = file;
+            }
+            return dict;
+        }
+
         /// <summary>
         /// Gets the filtered file system entries.
         /// </summary>
@@ -42,13 +53,13 @@ namespace MediaBrowser.Controller.IO
                 throw new ArgumentNullException("args");
             }
 
+            var entries = directoryService.GetFileSystemEntries(path);
+
             if (!resolveShortcuts && flattenFolderDepth == 0)
             {
-                return directoryService.GetFileSystemDictionary(path);
+                return GetFileSystemDictionary(entries);
             }
 
-            var entries = directoryService.GetFileSystemEntries(path);
-
             var dict = new Dictionary<string, FileSystemMetadata>(StringComparer.OrdinalIgnoreCase);
 
             foreach (var entry in entries)