From f6d16d5624f7a922de7d497fa18fb4f0f8458b6a Mon Sep 17 00:00:00 2001 From: Soreepeong Date: Sat, 9 Dec 2023 02:04:04 +0900 Subject: [PATCH] Do operations that may throw first --- .../Interface/Internal/ImGuiClipboardFunctionProvider.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dalamud/Interface/Internal/ImGuiClipboardFunctionProvider.cs b/Dalamud/Interface/Internal/ImGuiClipboardFunctionProvider.cs index 265bc5812..76e8e73e6 100644 --- a/Dalamud/Interface/Internal/ImGuiClipboardFunctionProvider.cs +++ b/Dalamud/Interface/Internal/ImGuiClipboardFunctionProvider.cs @@ -42,12 +42,12 @@ internal sealed unsafe class ImGuiClipboardFunctionProvider : IServiceType, IDis Debug.Assert(ImGuiHelpers.IsImGuiInitialized, "IMWS initialized but IsImGuiInitialized is false?"); var io = ImGui.GetIO(); + this.clipboardUserDataOriginal = io.ClipboardUserData; this.setTextOriginal = (delegate* unmanaged)io.SetClipboardTextFn; this.getTextOriginal = (delegate* unmanaged)io.GetClipboardTextFn; - this.clipboardUserDataOriginal = io.ClipboardUserData; - io.SetClipboardTextFn = (nint)(delegate* unmanaged)(&StaticSetClipboardTextImpl); - io.GetClipboardTextFn = (nint)(delegate* unmanaged)&StaticGetClipboardTextImpl; io.ClipboardUserData = GCHandle.ToIntPtr(this.clipboardUserData = GCHandle.Alloc(this)); + io.SetClipboardTextFn = (nint)(delegate* unmanaged)&StaticSetClipboardTextImpl; + io.GetClipboardTextFn = (nint)(delegate* unmanaged)&StaticGetClipboardTextImpl; return; [UnmanagedCallersOnly]