Set initial display media type at resolve time

1 files changed, 1 insertions, 41 deletions

diff --git a/MediaBrowser.Controller/Entities/BasePluginFolder.cs b/MediaBrowser.Controller/Entities/BasePluginFolder.cs
index bf8040a9f..fabb69c0f 100644
--- a/MediaBrowser.Controller/Entities/BasePluginFolder.cs
+++ b/MediaBrowser.Controller/Entities/BasePluginFolder.cs
@@ -1,6 +1,4 @@
-using MediaBrowser.Common.Extensions;
-using System;
-using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Entities;
 
 namespace MediaBrowser.Controller.Entities
 {
@@ -11,27 +9,6 @@ namespace MediaBrowser.Controller.Entities
     public abstract class BasePluginFolder : Folder, ICollectionFolder, IByReferenceItem
     {
         /// <summary>
-        /// Gets or sets the id.
-        /// </summary>
-        /// <value>The id.</value>
-        public override Guid Id
-        {
-            get
-            {
-                // This doesn't get populated through the normal resolving process
-                if (base.Id == Guid.Empty)
-                {
-                    base.Id = (Path ?? Name).GetMBId(GetType());
-                }
-                return base.Id;
-            }
-            set
-            {
-                base.Id = value;
-            }
-        }        
-        
-        /// <summary>
         /// Gets or sets the type of the location.
         /// </summary>
         /// <value>The type of the location.</value>
@@ -42,22 +19,5 @@ namespace MediaBrowser.Controller.Entities
                 return LocationType.Virtual;
             }
         }
-
-
-        /// <summary>
-        /// We don't resolve normally so need to fill this in
-        /// </summary>
-        public override string DisplayMediaType
-        {
-            get
-            {
-                return "CollectionFolder"; // Plug-in folders are collection folders
-            }
-            set
-            {
-                base.DisplayMediaType = value;
-            }
-        }
-
     }
 }