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

fix: no hard error when tier 3 load isn't detected

Browse source
This commit is contained in:
goat 2021-10-25 16:27:40 +02:00
parent 18211355e3
commit a4629447d6
No known key found for this signature in database
GPG key ID: 7773BB5B43BA52E5
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Dalamud/Game/Framework.cs
View file

@ -28,7 +28,7 @@ namespace Dalamud.Game
private static Stopwatch statsStopwatch = new(); private static Stopwatch statsStopwatch = new();
private Stopwatch updateStopwatch = new(); private Stopwatch updateStopwatch = new();
private DateTime timeSinceTier2; private DateTime tier2LoadTime;
private Hook<OnUpdateDetour> updateHook; private Hook<OnUpdateDetour> updateHook;
private Hook<OnDestroyDetour> destroyHook; private Hook<OnDestroyDetour> destroyHook;
@ -179,13 +179,14 @@ namespace Dalamud.Game
if (!dalamud.IsReady) if (!dalamud.IsReady)
{ {
dalamud.LoadTier2(); dalamud.LoadTier2();
this.timeSinceTier2 = DateTime.Now; this.tier2LoadTime = DateTime.Now;
goto original; goto original;
} }
if (!dalamud.IsLoadedPluginSystem && (DateTime.Now - this.timeSinceTier2).TotalSeconds > 30) if (!dalamud.IsLoadedPluginSystem && (DateTime.Now - this.tier2LoadTime).TotalSeconds > 30)
{ {
Util.Fatal("The Dalamud plugin system could not initialize important subsystems.\nThis error may be caused by outdated ReShade or GShade installations.\n\nIf this error persists, please contact us.", "XIVLauncher Error"); Log.Error("Did not detect tier 3 load!!! {Seconds}", (DateTime.Now - this.tier2LoadTime).TotalSeconds);
// Util.Fatal("The Dalamud plugin system could not initialize important subsystems.\nThis error may be caused by outdated ReShade or GShade installations.\n\nIf this error persists, please contact us.", "XIVLauncher Error");
} }
// Plugins expect the interface to be available and ready, so we need to wait with plugins until we have init'd ImGui // Plugins expect the interface to be available and ready, so we need to wait with plugins until we have init'd ImGui