From 14f46ade6a43b8834b815be4a80a9ebea88dabdf Mon Sep 17 00:00:00 2001 From: Sinai <49360850+sinai-dev@users.noreply.github.com> Date: Sun, 24 Apr 2022 01:58:27 +1000 Subject: [PATCH] Cancel pending generic when edit button pressed --- src/Hooks/HookCreator.cs | 2 ++ src/Hooks/HookList.cs | 3 +++ 2 files changed, 5 insertions(+) diff --git a/src/Hooks/HookCreator.cs b/src/Hooks/HookCreator.cs index a28ee1d..fe207f3 100644 --- a/src/Hooks/HookCreator.cs +++ b/src/Hooks/HookCreator.cs @@ -39,6 +39,8 @@ namespace UnityExplorer.Hooks internal static Type pendingGenericDefinition; internal static MethodInfo pendingGenericMethod; + public static bool PendingGeneric => pendingGenericDefinition != null || pendingGenericMethod != null; + // Hook Source Editor UI public static GameObject EditorRoot { get; private set; } public static Text EditingHookLabel { get; private set; } diff --git a/src/Hooks/HookList.cs b/src/Hooks/HookList.cs index c434949..584e9f5 100644 --- a/src/Hooks/HookList.cs +++ b/src/Hooks/HookList.cs @@ -47,6 +47,9 @@ namespace UnityExplorer.Hooks public static void EditPatchClicked(int index) { + if (HookCreator.PendingGeneric) + HookManagerPanel.genericArgsHandler.Cancel(); + HookManagerPanel.Instance.SetPage(HookManagerPanel.Pages.HookSourceEditor); HookInstance hook = (HookInstance)currentHooks[index]; HookCreator.SetEditedHook(hook);