pull/702/head
Luke Pulverenti 9 years ago
parent 0a85cc6d8e
commit ffb9a86cec

@ -484,7 +484,6 @@ namespace MediaBrowser.Controller.Entities
public Guid ParentId { get; set; } public Guid ParentId { get; set; }
private Folder _parent;
/// <summary> /// <summary>
/// Gets or sets the parent. /// Gets or sets the parent.
/// </summary> /// </summary>
@ -494,11 +493,6 @@ namespace MediaBrowser.Controller.Entities
{ {
get get
{ {
if (_parent != null)
{
return _parent;
}
if (ParentId != Guid.Empty) if (ParentId != Guid.Empty)
{ {
return LibraryManager.GetItemById(ParentId) as Folder; return LibraryManager.GetItemById(ParentId) as Folder;
@ -506,12 +500,10 @@ namespace MediaBrowser.Controller.Entities
return null; return null;
} }
set { _parent = value; }
} }
public void SetParent(Folder parent) public void SetParent(Folder parent)
{ {
Parent = parent;
ParentId = parent == null ? Guid.Empty : parent.Id; ParentId = parent == null ? Guid.Empty : parent.Id;
} }

Loading…
Cancel
Save