diff options
| author | Erwin de Haan <EraYaN@users.noreply.github.com> | 2019-01-18 17:04:01 +0100 |
|---|---|---|
| committer | Erwin de Haan <EraYaN@users.noreply.github.com> | 2019-01-18 17:04:01 +0100 |
| commit | d116efe1f78c1ad1aa69221b3092800348d23503 (patch) | |
| tree | 58670996079d97ce83db201ae85800b377337957 /Emby.Server.Implementations/ApplicationHost.cs | |
| parent | c1f76eb8ab2c4fe536a9b612d659bf739f0cc7ac (diff) | |
| parent | 440350a3f649b648f43a1d531153cc2c68edbee5 (diff) | |
Merge branch 'dev' into reformat
Diffstat (limited to 'Emby.Server.Implementations/ApplicationHost.cs')
| -rw-r--r-- | Emby.Server.Implementations/ApplicationHost.cs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs index d4144d5c5..91eaf9bbf 100644 --- a/Emby.Server.Implementations/ApplicationHost.cs +++ b/Emby.Server.Implementations/ApplicationHost.cs @@ -230,7 +230,6 @@ namespace Emby.Server.Implementations { get { - #if BETA return PackageVersionClass.Beta; #endif @@ -510,7 +509,7 @@ namespace Emby.Server.Implementations protected void RegisterSingleInstance<T>(T obj, bool manageLifetime = true) where T : class { - Container.RegisterSingleton(obj); + Container.RegisterInstance<T>(obj); if (manageLifetime) { @@ -575,7 +574,7 @@ namespace Emby.Server.Implementations } catch (Exception ex) { - Logger.LogError(ex, "Error loading assembly {file}", file); + Logger.LogError(ex, "Error loading assembly {File}", file); return null; } } |
