michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #1287 from MediaBrowser/master

Browse Source 
merge from master
This commit is contained in:
Luke 2015-11-26 23:37:58 -05:00
commit 7f706faad2
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
MediaBrowser.Controller/LiveTv/LiveTvProgram.cs
View File

@ -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>

11
MediaBrowser.Controller/LiveTv/LiveTvVideoRecording.cs
View File

@ -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; }