ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2026-02-13 19:37:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix Addon/AgentLifyCycle unreg

Browse source 
(cherry picked from commit 29e1715ff589b9dddf5a747b8655ea382e08cf58)
This commit is contained in:
AtmoOmen 2026-02-12 16:54:55 +08:00 • committed by Blair
parent 1779d2681a
commit f01971a7d7
4 changed files with 22 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Dalamud/Game/Addon/Lifecycle/AddonLifecycle.cs
View file

@ -94,6 +94,8 @@ internal unsafe class AddonLifecycle : IInternalDisposableService
/// <param name="listener">The listener to unregister.</param>
internal void UnregisterListener(AddonLifecycleEventListener listener)
{
listener.IsRequestedToClear = true;
if (this.isInvokingListeners)
{
this.framework.RunOnTick(() => this.UnregisterListenerMethod(listener));
@ -122,6 +124,8 @@ internal unsafe class AddonLifecycle : IInternalDisposableService
{
foreach (var listener in globalListeners)
{
if (listener.IsRequestedToClear) continue;
try
{
listener.FunctionDelegate.Invoke(eventType, args);
@ -138,6 +142,8 @@ internal unsafe class AddonLifecycle : IInternalDisposableService
{
foreach (var listener in addonListener)
{
if (listener.IsRequestedToClear) continue;
try
{
listener.FunctionDelegate.Invoke(eventType, args);

5
Dalamud/Game/Addon/Lifecycle/AddonLifecycleEventListener.cs
View file

@ -35,4 +35,9 @@ internal class AddonLifecycleEventListener
/// Gets the delegate this listener invokes.
/// </summary>
public IAddonLifecycle.AddonEventDelegate FunctionDelegate { get; init; }
/// <summary>
/// Gets or sets if the listener is requested to be cleared.
/// </summary>
internal bool IsRequestedToClear { get; set; }
}

6
Dalamud/Game/Agent/AgentLifecycle.cs
View file

@ -107,6 +107,8 @@ internal unsafe class AgentLifecycle : IInternalDisposableService
/// <param name="listener">The listener to unregister.</param>
internal void UnregisterListener(AgentLifecycleEventListener listener)
{
listener.IsRequestedToClear = true;
if (this.isInvokingListeners)
{
this.framework.RunOnTick(() => this.UnregisterListenerMethod(listener));
@ -135,6 +137,8 @@ internal unsafe class AgentLifecycle : IInternalDisposableService
{
foreach (var listener in globalListeners)
{
if (listener.IsRequestedToClear) continue;
try
{
listener.FunctionDelegate.Invoke(eventType, args);
@ -151,6 +155,8 @@ internal unsafe class AgentLifecycle : IInternalDisposableService
{
foreach (var listener in agentListener)
{
if (listener.IsRequestedToClear) continue;
try
{
listener.FunctionDelegate.Invoke(eventType, args);

5
Dalamud/Game/Agent/AgentLifecycleEventListener.cs
View file

@ -35,4 +35,9 @@ public class AgentLifecycleEventListener
/// Gets the delegate this listener invokes.
/// </summary>
public IAgentLifecycle.AgentEventDelegate FunctionDelegate { get; init; }
/// <summary>
/// Gets or sets if the listener is requested to be cleared.
/// </summary>
internal bool IsRequestedToClear { get; set; }
}