Merge pull request #1166 from Bond-009/#1162

Fix exception on startup
This commit is contained in:
Joshua M. Boniface 2019-03-28 22:45:34 -04:00 committed by GitHub
commit fd86b141e2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1042,8 +1042,6 @@ namespace Emby.Server.Implementations
CollectionFolder.JsonSerializer = JsonSerializer; CollectionFolder.JsonSerializer = JsonSerializer;
CollectionFolder.ApplicationHost = this; CollectionFolder.ApplicationHost = this;
AuthenticatedAttribute.AuthService = AuthService; AuthenticatedAttribute.AuthService = AuthService;
InstallationManager.PluginInstalled += PluginInstalled;
} }
private async void PluginInstalled(object sender, GenericEventArgs<PackageVersionInfo> args) private async void PluginInstalled(object sender, GenericEventArgs<PackageVersionInfo> args)
@ -1085,6 +1083,7 @@ namespace Emby.Server.Implementations
protected void FindParts() protected void FindParts()
{ {
InstallationManager = _serviceProvider.GetService<IInstallationManager>(); InstallationManager = _serviceProvider.GetService<IInstallationManager>();
InstallationManager.PluginInstalled += PluginInstalled;
if (!ServerConfigurationManager.Configuration.IsPortAuthorized) if (!ServerConfigurationManager.Configuration.IsPortAuthorized)
{ {