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

ioc: actually make early blocking services blocking again

Browse source
This commit is contained in:
goat 2024-04-18 22:26:44 +02:00
parent ddc7667ab5
commit 1d75c8edda
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Dalamud/Dalamud.cs
View file

@ -69,9 +69,15 @@ internal sealed class Dalamud : IServiceType
// Set up FFXIVClientStructs
this.SetupClientStructsResolver(cacheDir);
void KickoffGameThread()
{
Log.Verbose("=============== GAME THREAD KICKOFF ===============");
Timings.Event("Game thread kickoff");
NativeFunctions.SetEvent(mainThreadContinueEvent);
}
if (!configuration.IsResumeGameAfterPluginLoad)
{
NativeFunctions.SetEvent(mainThreadContinueEvent);
ServiceManager.InitializeEarlyLoadableServices()
.ContinueWith(t =>
{
@ -83,6 +89,8 @@ internal sealed class Dalamud : IServiceType
"Dalamud failed to load all necessary services.\n\nThe game will continue, but you may not be able to use plugins.",
"Dalamud", false);
});
ServiceManager.BlockingResolved.ContinueWith(_ => KickoffGameThread());
}
else
{
@ -101,7 +109,7 @@ internal sealed class Dalamud : IServiceType
if (faultedTasks.Any())
throw new AggregateException(faultedTasks);
NativeFunctions.SetEvent(mainThreadContinueEvent);
KickoffGameThread();
await Task.WhenAll(tasks);
}
@ -112,7 +120,7 @@ internal sealed class Dalamud : IServiceType
}
finally
{
NativeFunctions.SetEvent(mainThreadContinueEvent);
KickoffGameThread();
}
});
}