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.Core/ApplicationHost.cs | |
| parent | 82e575a0be5ebcc636a78acd25e701b9d50c2640 (diff) | |
| parent | ce47f6338950853110ecc1d6bbd312b532b2ed8a (diff) | |
Merge pull request #2712 from MediaBrowser/dev
Dev
Diffstat (limited to 'Emby.Server.Core/ApplicationHost.cs')
| -rw-r--r-- | Emby.Server.Core/ApplicationHost.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Emby.Server.Core/ApplicationHost.cs b/Emby.Server.Core/ApplicationHost.cs index 7019fe0de..04309e7f4 100644 --- a/Emby.Server.Core/ApplicationHost.cs +++ b/Emby.Server.Core/ApplicationHost.cs @@ -561,7 +561,7 @@ namespace Emby.Server.Core StringExtensions.LocalizationManager = LocalizationManager; RegisterSingleInstance(LocalizationManager); - ITextEncoding textEncoding = new TextEncoding(FileSystemManager, LogManager.GetLogger("TextEncoding")); + ITextEncoding textEncoding = new TextEncoding(FileSystemManager, LogManager.GetLogger("TextEncoding"), JsonSerializer); RegisterSingleInstance(textEncoding); Utilities.EncodingHelper = textEncoding; RegisterSingleInstance<IBlurayExaminer>(() => new BdInfoExaminer(FileSystemManager, textEncoding)); |