alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-03-28 04:51:54 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

3.2.20.5

Browse Source
This commit is contained in:
Luke Pulverenti
2017-06-18 03:11:55 -04:00
parent 0e7cbb0465
commit ce47f63389
6 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Emby.Server.Implementations/Dto/DtoService.cs
View File

@@ -778,16 +778,16 @@ namespace Emby.Server.Implementations.Dto
.Select(i => new NameIdPair
{
Name = i,
Id = GetStudioId(i, item)
Id = GetGenreId(i, item)
})
.ToArray();
}
private string GetStudioId(string name, BaseItem owner)
private string GetGenreId(string name, BaseItem owner)
{
if (owner is IHasMusicGenres)
{
return _libraryManager.GetGameGenreId(name).ToString("N");
return _libraryManager.GetMusicGenreId(name).ToString("N");
}
if (owner is Game || owner is GameSystem)

2
Emby.Server.Implementations/ServerManager/WebSocketConnection.cs
View File

@@ -136,7 +136,7 @@ namespace Emby.Server.Implementations.ServerManager
return;
}
var charset = _textEncoding.GetDetectedEncodingName(bytes, null);
var charset = _textEncoding.GetDetectedEncodingName(bytes, null, false);
if (string.Equals(charset, "utf-8", StringComparison.OrdinalIgnoreCase))
{