fix: crash on game closing, thanks Dragon!

This commit is contained in:
goat 2021-04-05 03:59:18 +02:00
parent 0fadeb9a05
commit 24525d3d47

View file

@ -164,11 +164,16 @@ namespace Dalamud.Game.Internal {
private IntPtr HandleFrameworkDestroy() { private IntPtr HandleFrameworkDestroy() {
Log.Information("Framework::OnDestroy!"); Log.Information("Framework::OnDestroy!");
// Store the pointer to the original trampoline location
var originalPtr = Marshal.GetFunctionPointerForDelegate(this.destroyHook.Original);
this.dalamud.Unload(); this.dalamud.Unload();
this.dalamud.WaitForUnloadFinish(); this.dalamud.WaitForUnloadFinish();
return this.destroyHook.Original(); // Return the original trampoline location to cleanly exit
return originalPtr;
} }
} }
} }