From a4629447d6cee615a4e11e779d2ba3bcd16dda62 Mon Sep 17 00:00:00 2001 From: goat <16760685+goaaats@users.noreply.github.com> Date: Mon, 25 Oct 2021 16:27:40 +0200 Subject: [PATCH] fix: no hard error when tier 3 load isn't detected --- Dalamud/Game/Framework.cs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Dalamud/Game/Framework.cs b/Dalamud/Game/Framework.cs index 8f8ede47e..988a08693 100644 --- a/Dalamud/Game/Framework.cs +++ b/Dalamud/Game/Framework.cs @@ -28,7 +28,7 @@ namespace Dalamud.Game private static Stopwatch statsStopwatch = new(); private Stopwatch updateStopwatch = new(); - private DateTime timeSinceTier2; + private DateTime tier2LoadTime; private Hook updateHook; private Hook destroyHook; @@ -179,13 +179,14 @@ namespace Dalamud.Game if (!dalamud.IsReady) { dalamud.LoadTier2(); - this.timeSinceTier2 = DateTime.Now; + this.tier2LoadTime = DateTime.Now; 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