tighter control of shortcuts

1 files changed, 4 insertions, 2 deletions

diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
index 46e8b261f..e1d2e42b5 100644
--- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
@@ -413,10 +413,12 @@ namespace MediaBrowser.Server.Implementations.Library
             // Gather child folder and files
             if (args.IsDirectory)
             {
+                var isPhysicalRoot = args.IsPhysicalRoot;
+
                 // When resolving the root, we need it's grandchildren (children of user views)
-                var flattenFolderDepth = args.IsPhysicalRoot ? 2 : 0;
+                var flattenFolderDepth = isPhysicalRoot ? 2 : 0;
 
-                args.FileSystemDictionary = FileData.GetFilteredFileSystemEntries(args.Path, _logger, flattenFolderDepth: flattenFolderDepth, args: args);
+                args.FileSystemDictionary = FileData.GetFilteredFileSystemEntries(args.Path, _logger, flattenFolderDepth: flattenFolderDepth, args: args, resolveShortcuts: isPhysicalRoot || args.IsVf);
             }
 
             // Check to see if we should resolve based on our contents