Merge pull request #3 from MediaBrowser/master

Sync with Master

3 files changed, 38 insertions, 28 deletions

diff --git a/MediaBrowser.Server.Implementations/Collections/CollectionManager.cs b/MediaBrowser.Server.Implementations/Collections/CollectionManager.cs
index 653cbacb6..adcf3edba 100644
--- a/MediaBrowser.Server.Implementations/Collections/CollectionManager.cs
+++ b/MediaBrowser.Server.Implementations/Collections/CollectionManager.cs
@@ -93,7 +93,13 @@ namespace MediaBrowser.Server.Implementations.Collections
                 // Find an actual physical folder
                 if (folder is CollectionFolder)
                 {
-                    return _libraryManager.RootFolder.Children.OfType<Folder>().First(i => folder.PhysicalLocations.Contains(i.Path, StringComparer.OrdinalIgnoreCase));
+                    var child = _libraryManager.RootFolder.Children.OfType<Folder>()
+                        .FirstOrDefault(i => folder.PhysicalLocations.Contains(i.Path, StringComparer.OrdinalIgnoreCase));
+
+                    if (child != null)
+                    {
+                        return child;
+                    }
                 }
             }
 
diff --git a/MediaBrowser.Server.Implementations/Collections/CollectionsDynamicFolder.cs b/MediaBrowser.Server.Implementations/Collections/CollectionsDynamicFolder.cs
index 834fbcd31..915a27c11 100644
--- a/MediaBrowser.Server.Implementations/Collections/CollectionsDynamicFolder.cs
+++ b/MediaBrowser.Server.Implementations/Collections/CollectionsDynamicFolder.cs
@@ -1,7 +1,6 @@
 using MediaBrowser.Common.Configuration;
 using MediaBrowser.Controller.Entities;
 using System.IO;
-using System.Linq;
 
 namespace MediaBrowser.Server.Implementations.Collections
 {
@@ -26,30 +25,4 @@ namespace MediaBrowser.Server.Implementations.Collections
             };
         }
     }
-
-    public class ManualCollectionsFolder : BasePluginFolder
-    {
-        public ManualCollectionsFolder()
-        {
-            Name = "Collections";
-        }
-
-        public override bool IsVisible(User user)
-        {
-            if (!GetChildren(user, true).Any())
-            {
-                return false;
-            }
-
-            return base.IsVisible(user);
-        }
-
-        public override bool IsHidden
-        {
-            get
-            {
-                return !ActualChildren.Any() || base.IsHidden;
-            }
-        }
-    }
 }
diff --git a/MediaBrowser.Server.Implementations/Collections/ManualCollectionsFolder.cs b/MediaBrowser.Server.Implementations/Collections/ManualCollectionsFolder.cs
new file mode 100644
index 000000000..e36c63b1c
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/Collections/ManualCollectionsFolder.cs
@@ -0,0 +1,31 @@
+using System.Linq;
+using MediaBrowser.Controller.Entities;
+
+namespace MediaBrowser.Server.Implementations.Collections
+{
+    public class ManualCollectionsFolder : BasePluginFolder
+    {
+        public ManualCollectionsFolder()
+        {
+            Name = "Collections";
+        }
+
+        public override bool IsVisible(User user)
+        {
+            if (!GetChildren(user, true).Any())
+            {
+                return false;
+            }
+
+            return base.IsVisible(user);
+        }
+
+        public override bool IsHidden
+        {
+            get
+            {
+                return !ActualChildren.Any() || base.IsHidden;
+            }
+        }
+    }
+}
\ No newline at end of file