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

Return the resulting service, not the Task

Browse source
This commit is contained in:
Haselnussbomber 2025-10-19 23:30:25 +02:00
parent 46dee9a483
commit 9001c96986
No known key found for this signature in database
GPG key ID: BB905BB49E7295D1
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Dalamud/IoC/Internal/ServiceContainer.cs
View file

@ -161,7 +161,7 @@ internal class ServiceContainer : IServiceProvider, IServiceType
public IServiceScope GetScope() => new ServiceScopeImpl(this); public IServiceScope GetScope() => new ServiceScopeImpl(this);
/// <inheritdoc/> /// <inheritdoc/>
object? IServiceProvider.GetService(Type serviceType) => this.GetSingletonService(serviceType); public object? GetService(Type serviceType) => this.GetSingletonService(serviceType).Result;
private async Task<object> GetService(Type serviceType, ServiceScopeImpl? scope, object[] scopedObjects) private async Task<object> GetService(Type serviceType, ServiceScopeImpl? scope, object[] scopedObjects)
{ {

4
Dalamud/IoC/Internal/ServiceScope.cs
View file

@ -58,9 +58,9 @@ internal class ServiceScopeImpl : IServiceScope
public ServiceScopeImpl(ServiceContainer container) => this.container = container; public ServiceScopeImpl(ServiceContainer container) => this.container = container;
/// <inheritdoc/> /// <inheritdoc/>
object? IServiceProvider.GetService(Type serviceType) public object? GetService(Type serviceType)
{ {
return ((IServiceProvider)this.container).GetService(serviceType); return this.container.GetService(serviceType);
} }
/// <inheritdoc/> /// <inheritdoc/>