From dc28194ade4ef0806c46a4f02c54847691f99863 Mon Sep 17 00:00:00 2001 From: Kaz Wolfe Date: Tue, 5 Aug 2025 12:34:38 -0700 Subject: [PATCH] fix: addonargs name --- Dalamud/Game/Addon/Lifecycle/AddonArgTypes/AddonArgs.cs | 8 +++----- .../Internal/Windows/Data/Widgets/AddonLifecycleWidget.cs | 5 ++++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Dalamud/Game/Addon/Lifecycle/AddonArgTypes/AddonArgs.cs b/Dalamud/Game/Addon/Lifecycle/AddonArgTypes/AddonArgs.cs index 8a97f5cc2..c008db08f 100644 --- a/Dalamud/Game/Addon/Lifecycle/AddonArgTypes/AddonArgs.cs +++ b/Dalamud/Game/Addon/Lifecycle/AddonArgTypes/AddonArgs.cs @@ -38,7 +38,7 @@ public abstract unsafe class AddonArgs /// /// The name to check. /// Whether it is the case. - internal bool IsAddon(ReadOnlySpan name) + internal bool IsAddon(string name) { if (this.Addon.IsNull) return false; @@ -46,12 +46,10 @@ public abstract unsafe class AddonArgs if (name.Length is 0 or > 32) return false; - var addonName = this.Addon.Name; - - if (string.IsNullOrEmpty(addonName)) + if (string.IsNullOrEmpty(this.Addon.Name)) return false; - return name == addonName; + return name == this.Addon.Name; } /// diff --git a/Dalamud/Interface/Internal/Windows/Data/Widgets/AddonLifecycleWidget.cs b/Dalamud/Interface/Internal/Windows/Data/Widgets/AddonLifecycleWidget.cs index 15c27d5b7..b58166e89 100644 --- a/Dalamud/Interface/Internal/Windows/Data/Widgets/AddonLifecycleWidget.cs +++ b/Dalamud/Interface/Internal/Windows/Data/Widgets/AddonLifecycleWidget.cs @@ -1,3 +1,4 @@ +using System.Diagnostics; using System.Diagnostics.CodeAnalysis; using System.Linq; @@ -117,9 +118,11 @@ public class AddonLifecycleWidget : IDataWindowWidget { ImGui.Columns(2); + var functionAddress = receiveEventListener.FunctionAddress; + ImGui.Text("Hook Address"u8); ImGui.NextColumn(); - ImGui.Text(receiveEventListener.FunctionAddress.ToString("X")); + ImGui.Text($"0x{functionAddress:X} (ffxiv_dx11.exe+{functionAddress - Process.GetCurrentProcess().MainModule!.BaseAddress:X})"); ImGui.NextColumn(); ImGui.Text("Hook Status"u8);