From 36577ac42ea9a38a155ca7cd0d17d2d43563a27f Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Wed, 24 Dec 2014 01:28:40 -0500
Subject: sync updates

---
 MediaBrowser.Controller/Entities/CollectionFolder.cs | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'MediaBrowser.Controller/Entities/CollectionFolder.cs')

diff --git a/MediaBrowser.Controller/Entities/CollectionFolder.cs b/MediaBrowser.Controller/Entities/CollectionFolder.cs
index a10742f01..f47a439a7 100644
--- a/MediaBrowser.Controller/Entities/CollectionFolder.cs
+++ b/MediaBrowser.Controller/Entities/CollectionFolder.cs
@@ -66,6 +66,22 @@ namespace MediaBrowser.Controller.Entities
             return CreateResolveArgs(directoryService).FileSystemChildren;
         }
 
+        internal override bool IsValidFromResolver(BaseItem newItem)
+        {
+            var newCollectionFolder = newItem as CollectionFolder;
+
+            if (newCollectionFolder != null)
+            {
+                if (!string.Equals(CollectionType, newCollectionFolder.CollectionType, StringComparison.OrdinalIgnoreCase))
+                {
+                    return false;
+                }
+            }
+
+
+            return base.IsValidFromResolver(newItem);
+        }
+
         private ItemResolveArgs CreateResolveArgs(IDirectoryService directoryService)
         {
             var path = ContainingFolderPath;
-- 
cgit v1.2.3