Merge pull request #1287 from MediaBrowser/master

merge from master

MediaBrowser.Controller/LiveTv/LiveTvProgram.cs

@@ -28,7 +28,15 @@ namespace MediaBrowser.Controller.LiveTv
                     return key;
                 }
             }
-            return GetClientTypeName() + "-" + Name;
+
+            if (IsSeries && !string.IsNullOrWhiteSpace(EpisodeTitle))
+            {
+                var name = GetClientTypeName();
+
+                return name + "-" + Name + (EpisodeTitle ?? string.Empty);
+            }
+
+            return base.CreateUserDataKey();
         }
 
         /// <summary>

MediaBrowser.Controller/LiveTv/LiveTvVideoRecording.cs

@@ -52,10 +52,15 @@ namespace MediaBrowser.Controller.LiveTv
                     return key;
                 }
             }
-            
-            var name = GetClientTypeName();
 
-            return name + "-" + Name + (EpisodeTitle ?? string.Empty);
+            if (IsSeries && !string.IsNullOrWhiteSpace(EpisodeTitle))
+            {
+                var name = GetClientTypeName();
+
+                return name + "-" + Name + (EpisodeTitle ?? string.Empty);
+            }
+
+            return base.CreateUserDataKey();
         }
 
         public string ServiceName { get; set; }