Added SupportsAutoRunAtStartup

3 files changed, 22 insertions, 2 deletions

diff --git a/MediaBrowser.Controller/IServerApplicationHost.cs b/MediaBrowser.Controller/IServerApplicationHost.cs
index f96c2536e..f3312d2cb 100644
--- a/MediaBrowser.Controller/IServerApplicationHost.cs
+++ b/MediaBrowser.Controller/IServerApplicationHost.cs
@@ -25,5 +25,11 @@ namespace MediaBrowser.Controller
         /// </summary>
         /// <value>The HTTP server URL prefix.</value>
         string HttpServerUrlPrefix { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether [supports automatic run at startup].
+        /// </summary>
+        /// <value><c>true</c> if [supports automatic run at startup]; otherwise, <c>false</c>.</value>
+        bool SupportsAutoRunAtStartup { get; }
     }
 }
diff --git a/MediaBrowser.Controller/LiveTv/LiveTvAudioRecording.cs b/MediaBrowser.Controller/LiveTv/LiveTvAudioRecording.cs
index 8676540fd..93de9d5c3 100644
--- a/MediaBrowser.Controller/LiveTv/LiveTvAudioRecording.cs
+++ b/MediaBrowser.Controller/LiveTv/LiveTvAudioRecording.cs
@@ -11,7 +11,14 @@ namespace MediaBrowser.Controller.LiveTv
         /// <returns>System.String.</returns>
         public override string GetUserDataKey()
         {
-            return GetClientTypeName() + "-" + Name;
+            var name = GetClientTypeName();
+
+            if (!string.IsNullOrEmpty(RecordingInfo.ProgramId))
+            {
+                return name + "-" + RecordingInfo.ProgramId;
+            }
+
+            return name + "-" + RecordingInfo.Name + (RecordingInfo.EpisodeTitle ?? string.Empty);
         }
 
         public RecordingInfo RecordingInfo { get; set; }
diff --git a/MediaBrowser.Controller/LiveTv/LiveTvVideoRecording.cs b/MediaBrowser.Controller/LiveTv/LiveTvVideoRecording.cs
index 9dfc7f828..bc4ed5493 100644
--- a/MediaBrowser.Controller/LiveTv/LiveTvVideoRecording.cs
+++ b/MediaBrowser.Controller/LiveTv/LiveTvVideoRecording.cs
@@ -11,7 +11,14 @@ namespace MediaBrowser.Controller.LiveTv
         /// <returns>System.String.</returns>
         public override string GetUserDataKey()
         {
-            return GetClientTypeName() + "-" + Name;
+            var name = GetClientTypeName();
+
+            if (!string.IsNullOrEmpty(RecordingInfo.ProgramId))
+            {
+                return name + "-" + RecordingInfo.ProgramId;
+            }
+
+            return name + "-" + RecordingInfo.Name + (RecordingInfo.EpisodeTitle ?? string.Empty);
         }
 
         public RecordingInfo RecordingInfo { get; set; }