diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-04-20 23:49:50 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-20 23:49:50 -0400 |
| commit | f525f5a89e68248a81ab7cfdfa044fbe45e51863 (patch) | |
| tree | f029e380a0867d6e8db7895e63d9a69e0cfd426f /Emby.Server.Core/ApplicationHost.cs | |
| parent | 5dca8cb077fb544628f62939bbda292d8c91b637 (diff) | |
| parent | b9fe720e736abacc57ffb846e4ce6644bc110f61 (diff) | |
Merge pull request #2591 from MediaBrowser/beta
Beta
Diffstat (limited to 'Emby.Server.Core/ApplicationHost.cs')
| -rw-r--r-- | Emby.Server.Core/ApplicationHost.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Emby.Server.Core/ApplicationHost.cs b/Emby.Server.Core/ApplicationHost.cs index 50c572b8c..b7309de66 100644 --- a/Emby.Server.Core/ApplicationHost.cs +++ b/Emby.Server.Core/ApplicationHost.cs @@ -564,7 +564,7 @@ namespace Emby.Server.Core StringExtensions.LocalizationManager = LocalizationManager; RegisterSingleInstance(LocalizationManager); - ITextEncoding textEncoding = new TextEncoding(FileSystemManager); + ITextEncoding textEncoding = new TextEncoding(FileSystemManager, LogManager.GetLogger("TextEncoding")); RegisterSingleInstance(textEncoding); Utilities.EncodingHelper = textEncoding; RegisterSingleInstance<IBlurayExaminer>(() => new BdInfoExaminer(FileSystemManager, textEncoding)); @@ -1366,7 +1366,7 @@ namespace Emby.Server.Core SupportsLibraryMonitor = true, EncoderLocationType = MediaEncoder.EncoderLocationType, SystemArchitecture = EnvironmentInfo.SystemArchitecture, - SystemUpdateLevel = ConfigurationManager.CommonConfiguration.SystemUpdateLevel, + SystemUpdateLevel = SystemUpdateLevel, PackageName = StartupOptions.GetOption("-package") }; } @@ -1591,7 +1591,7 @@ namespace Emby.Server.Core } catch (NotImplementedException) { - + } catch (Exception ex) { @@ -1632,7 +1632,7 @@ namespace Emby.Server.Core public override async Task<CheckForUpdateResult> CheckForApplicationUpdate(CancellationToken cancellationToken, IProgress<double> progress) { var cacheLength = TimeSpan.FromHours(3); - var updateLevel = ConfigurationManager.CommonConfiguration.SystemUpdateLevel; + var updateLevel = SystemUpdateLevel; if (updateLevel == PackageVersionClass.Beta) { |