tighter control of shortcuts

1 files changed, 4 insertions, 2 deletions

diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index a2d045a5f..f7963c6e6 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -338,10 +338,12 @@ namespace MediaBrowser.Controller.Entities
 
             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);
             }
 
             //update our dates