Merge pull request #1005 from MediaBrowser/dev

3.0.5518.0

1 files changed, 9 insertions, 5 deletions

diff --git a/MediaBrowser.Controller/Channels/ChannelFolderItem.cs b/MediaBrowser.Controller/Channels/ChannelFolderItem.cs
index 8482e38df..7ba73d126 100644
--- a/MediaBrowser.Controller/Channels/ChannelFolderItem.cs
+++ b/MediaBrowser.Controller/Channels/ChannelFolderItem.cs
@@ -1,11 +1,10 @@
-using System;
-using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Model.Channels;
-using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Querying;
+using MediaBrowser.Model.Users;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
-using MediaBrowser.Model.Users;
 
 namespace MediaBrowser.Controller.Channels
 {
@@ -40,7 +39,7 @@ namespace MediaBrowser.Controller.Channels
             return false;
         }
 
-        public override string GetUserDataKey()
+        protected override string CreateUserDataKey()
         {
             return ExternalId;
         }
@@ -76,5 +75,10 @@ namespace MediaBrowser.Controller.Channels
         {
             return System.IO.Path.Combine(basePath, "channels", ChannelId, Id.ToString("N"));
         }
+
+        public override bool CanDelete()
+        {
+            return false;
+        }
     }
 }