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

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

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