Merge branch 'beta' of https://github.com/MediaBrowser/Emby into beta

1 files changed, 28 insertions, 0 deletions

diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index fca2c6e43..f57e2fa17 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -1578,8 +1578,36 @@ namespace MediaBrowser.Controller.Entities
             return !IsPlayed(user);
         }
 
+        [IgnoreDataMember]
+        public virtual bool SupportsUserDataFromChildren
+        {
+            get
+            {
+                // These are just far too slow. 
+                if (this is ICollectionFolder)
+                {
+                    return false;
+                }
+                if (this is UserView)
+                {
+                    return false;
+                }
+                if (this is UserRootFolder)
+                {
+                    return false;
+                }
+
+                return true;
+            }
+        }
+
         public override void FillUserDataDtoValues(UserItemDataDto dto, UserItemData userData, User user)
         {
+            if (!SupportsUserDataFromChildren)
+            {
+                return;
+            }
+
             var recursiveItemCount = 0;
             var unplayed = 0;