alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-27 01:50:53 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into api-merge-again

Browse Source
This commit is contained in:
crobibero
2020-08-04 20:29:06 -06:00
parent ff4489575b c12a49361c
commit e65ecb5687
29 changed files with 314 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
MediaBrowser.Model/Entities/MediaStream.cs
View File

@@ -233,7 +233,7 @@ namespace MediaBrowser.Model.Entities
if (!string.IsNullOrEmpty(Title))
{
var result = new StringBuilder(Title);
var result = new StringBuilder(Title);
foreach (var tag in attributes)
{
// Keep Tags that are not already in Title.
@@ -246,7 +246,7 @@ namespace MediaBrowser.Model.Entities
return result.ToString();
}
return string.Join(" - ", attributes.ToArray());
return string.Join(" - ", attributes);
}
default: