diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-06-18 03:13:06 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-18 03:13:06 -0400 |
| commit | 076e7f7bd15d89ccf6e79226a8fe0b1b29deff55 (patch) | |
| tree | 9fc42f1d9cc0f962a3a0424bb70298ba7855340f /Emby.Server.Implementations | |
| parent | 82e575a0be5ebcc636a78acd25e701b9d50c2640 (diff) | |
| parent | ce47f6338950853110ecc1d6bbd312b532b2ed8a (diff) | |
Merge pull request #2712 from MediaBrowser/dev
Dev
Diffstat (limited to 'Emby.Server.Implementations')
| -rw-r--r-- | Emby.Server.Implementations/Dto/DtoService.cs | 6 | ||||
| -rw-r--r-- | Emby.Server.Implementations/ServerManager/WebSocketConnection.cs | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Emby.Server.Implementations/Dto/DtoService.cs b/Emby.Server.Implementations/Dto/DtoService.cs index ae988f938..7352073bd 100644 --- a/Emby.Server.Implementations/Dto/DtoService.cs +++ b/Emby.Server.Implementations/Dto/DtoService.cs @@ -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) diff --git a/Emby.Server.Implementations/ServerManager/WebSocketConnection.cs b/Emby.Server.Implementations/ServerManager/WebSocketConnection.cs index e4392d7e6..4d5192fea 100644 --- a/Emby.Server.Implementations/ServerManager/WebSocketConnection.cs +++ b/Emby.Server.Implementations/ServerManager/WebSocketConnection.cs @@ -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)) { |