From 3640f620863e4947a07ad6ebbf54ab6427534b38 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Tue, 3 Jun 2014 23:34:36 -0400
Subject: create collections from movies page

---
 .../Library/LibraryManager.cs                             | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/Library/LibraryManager.cs')

diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
index 227e7bdfc..6ba2ac950 100644
--- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
@@ -674,14 +674,19 @@ namespace MediaBrowser.Server.Implementations.Library
             {
                 var folder = child.GetFolder();
 
-                if (folder.Id == Guid.Empty)
+                if (folder != null)
                 {
-                    folder.Id = (folder.Path ?? folder.GetType().Name).GetMBId(folder.GetType());
-                }
+                    if (folder.Id == Guid.Empty)
+                    {
+                        folder.Id = (folder.Path ?? folder.GetType().Name).GetMBId(folder.GetType());
+                    }
 
-                rootFolder.AddVirtualChild(folder);
+                    folder = GetItemById(folder.Id) as BasePluginFolder ?? folder;
 
-                RegisterItem(folder);
+                    rootFolder.AddVirtualChild(folder);
+
+                    RegisterItem(folder);
+                }
             }
 
             return rootFolder;
-- 
cgit v1.2.3