From 1333ea7a723e501d8fbb3ebfb9efdbc1142892ff Mon Sep 17 00:00:00 2001
From: goat <16760685+goaaats@users.noreply.github.com>
Date: Fri, 20 Aug 2021 15:51:13 +0200
Subject: [PATCH] fix: move client structs init before framework init, fixes
 potential race condition

---
 Dalamud/Dalamud.cs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/Dalamud/Dalamud.cs b/Dalamud/Dalamud.cs
index 07ab37343..6fc23b449 100644
--- a/Dalamud/Dalamud.cs
+++ b/Dalamud/Dalamud.cs
@@ -225,6 +225,10 @@ namespace Dalamud
                 this.SigScanner = new SigScanner(this.TargetModule, true);
                 this.HookManager = new HookManager(this);
 
+                // Initialize FFXIVClientStructs function resolver
+                FFXIVClientStructs.Resolver.Initialize();
+                Log.Information("[T1] FFXIVClientStructs initialized!");
+
                 // Initialize game subsystem
                 this.Framework = new Framework(this.SigScanner, this);
 
@@ -232,11 +236,6 @@ namespace Dalamud
 
                 this.Framework.Enable();
                 Log.Information("[T1] Framework ENABLE!");
-
-                // Initialize FFXIVClientStructs function resolver
-                FFXIVClientStructs.Resolver.Initialize();
-
-                Log.Information("[T1] FFXIVClientStructs initialized!");
             }
             catch (Exception ex)
             {