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

1 files changed, 4 insertions, 4 deletions

diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index 821e6b5ca..22efb09e1 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -134,7 +134,7 @@ namespace MediaBrowser.Controller.Entities
         /// <exception cref="System.InvalidOperationException">Unable to add  + item.Name</exception>
         public async Task AddChild(BaseItem item, CancellationToken cancellationToken)
         {
-            item.Parent = this;
+            item.SetParent(this);
 
             if (item.Id == Guid.Empty)
             {
@@ -230,7 +230,7 @@ namespace MediaBrowser.Controller.Entities
         {
             RemoveChildrenInternal(new[] { item });
 
-            item.Parent = null;
+            item.SetParent(null);
 
             return ItemRepository.SaveChildren(Id, ActualChildren.Select(i => i.Id).ToList(), cancellationToken);
         }
@@ -783,11 +783,11 @@ namespace MediaBrowser.Controller.Entities
                     return LibraryManager.GetOrAddByReferenceItem(item);
                 }
 
-                item.Parent = this;
+                item.SetParent(this);
             }
             else
             {
-                child.Parent = this;
+                child.SetParent(this);
                 LibraryManager.RegisterItem(child);
                 item = child;
             }