Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

3 files changed, 14 insertions, 1 deletions

diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index a724067d5b..0d91a2e868 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -1004,7 +1004,8 @@ namespace MediaBrowser.Controller.Entities
                 throw new ArgumentNullException();
             }
 
-            var list = new List<BaseItem>(10000);
+            var initialCount = _children == null ? 100 : _children.Count;
+            var list = new List<BaseItem>(initialCount);
 
             AddRecursiveChildrenInternal(user, includeLinkedChildren, list);
 
diff --git a/MediaBrowser.Controller/Entities/Game.cs b/MediaBrowser.Controller/Entities/Game.cs
index ef115c691b..6c15e73038 100644
--- a/MediaBrowser.Controller/Entities/Game.cs
+++ b/MediaBrowser.Controller/Entities/Game.cs
@@ -25,6 +25,12 @@ namespace MediaBrowser.Controller.Entities
         public int? PlayersSupported { get; set; }
 
         /// <summary>
+        /// Gets or sets a value indicating whether this instance is installed on client.
+        /// </summary>
+        /// <value><c>true</c> if this instance is installed on client; otherwise, <c>false</c>.</value>
+        public bool IsInstalledOnClient { get; set; }
+
+        /// <summary>
         /// Gets or sets the game system.
         /// </summary>
         /// <value>The game system.</value>
diff --git a/MediaBrowser.Controller/Entities/GameSystem.cs b/MediaBrowser.Controller/Entities/GameSystem.cs
index 39e95b91de..644405b4d4 100644
--- a/MediaBrowser.Controller/Entities/GameSystem.cs
+++ b/MediaBrowser.Controller/Entities/GameSystem.cs
@@ -19,5 +19,11 @@ namespace MediaBrowser.Controller.Entities
                 return Id;
             }
         }
+
+        /// <summary>
+        /// Gets or sets the game system.
+        /// </summary>
+        /// <value>The game system.</value>
+        public string GameSystemName { get; set; }
     }
 }