ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-13 12:14:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Revert "ioc: actually make early blocking services blocking again"

Browse source 
This reverts commit 1d75c8edda.
To be reapplied in #1779.
This commit is contained in:
goat 2024-04-20 17:08:40 +02:00
parent d4fc0da7f4
commit 3d2cec77c0
1 changed files with 3 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Dalamud/Dalamud.cs
View file

@ -68,16 +68,10 @@ 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 =>
{
@ -89,8 +83,6 @@ 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
{
@ -109,7 +101,7 @@ internal sealed class Dalamud : IServiceType
if (faultedTasks.Any())
throw new AggregateException(faultedTasks);
KickoffGameThread();
NativeFunctions.SetEvent(mainThreadContinueEvent);
await Task.WhenAll(tasks);
}
@ -120,7 +112,7 @@ internal sealed class Dalamud : IServiceType
}
finally
{
KickoffGameThread();
NativeFunctions.SetEvent(mainThreadContinueEvent);
}
});
}