alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-04 23:08:42 +01:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Merge branch 'dev' into reformat

Browse Source
This commit is contained in:
Erwin de Haan
2019-01-18 17:04:01 +01:00
parent c1f76eb8ab 440350a3f6
commit d116efe1f7
13 changed files with 137 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Emby.Server.Implementations/ApplicationHost.cs
View File

@@ -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;
}
}