Merge pull request #2347 from MediaBrowser/dev

Dev

2 files changed, 12 insertions, 0 deletions

diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index a84e9a5d23..943c9d8822 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -103,6 +103,16 @@ namespace MediaBrowser.Controller.Entities
             }
         }
 
+        public override bool CanDelete()
+        {
+            if (IsRoot)
+            {
+                return false;
+            }
+
+            return base.CanDelete();
+        }
+
         public override bool RequiresRefresh()
         {
             var baseResult = base.RequiresRefresh();
diff --git a/MediaBrowser.Controller/LiveTv/TimerInfo.cs b/MediaBrowser.Controller/LiveTv/TimerInfo.cs
index ee8dd5d3a7..10ed95fe5e 100644
--- a/MediaBrowser.Controller/LiveTv/TimerInfo.cs
+++ b/MediaBrowser.Controller/LiveTv/TimerInfo.cs
@@ -46,6 +46,8 @@ namespace MediaBrowser.Controller.LiveTv
         /// </summary>
         public string Overview { get; set; }
 
+        public string SeriesId { get; set; }
+
         /// <summary>
         /// The start date of the recording, in UTC.
         /// </summary>