ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-12 18:27:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix: don't handle scoped services in ServiceManager.UnloadAllServices()

Browse source 
Fixes a deadlock while unloading
This commit is contained in:
goat 2023-05-22 21:24:17 +02:00
parent b80681e3e1
commit 34bb2a7ad4
No known key found for this signature in database
GPG key ID: 49E2AA8C6A76498B
1 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Dalamud/ServiceManager.cs
View file

@ -309,6 +309,13 @@ internal static class ServiceManager
if (!serviceType.IsAssignableTo(typeof(IServiceType))) if (!serviceType.IsAssignableTo(typeof(IServiceType)))
continue; continue;
// Scoped services shall never be unloaded here.
// Their lifetime must be managed by the IServiceScope that owns them. If it leaks, it's their fault.
if (serviceType.GetServiceKind() == ServiceKind.ScopedService)
continue;
Log.Verbose("Calling GetDependencyServices for '{ServiceName}'", serviceType.FullName!);
dependencyServicesMap[serviceType] = dependencyServicesMap[serviceType] =
((List<Type>)typeof(Service<>) ((List<Type>)typeof(Service<>)
.MakeGenericType(serviceType) .MakeGenericType(serviceType)