Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions managed/CounterStrikeSharp.API/Core/BasePlugin.cs
Original file line number Diff line number Diff line change
Expand Up @@ -665,32 +665,32 @@ protected virtual void Dispose(bool disposing)
if (_disposed) return;
if (!disposing) return;

foreach (var subscriber in Handlers.Values)
foreach (var subscriber in Handlers.Values.ToList())
{
subscriber.Dispose();
}

foreach (var subscriber in CommandListeners.Values)
foreach (var subscriber in CommandListeners.Values.ToList())
{
subscriber.Dispose();
}

foreach (var subscriber in Listeners.Values)
foreach (var subscriber in Listeners.Values.ToList())
{
subscriber.Dispose();
}

foreach (var subscriber in EntityOutputHooks.Values)
foreach (var subscriber in EntityOutputHooks.Values.ToList())
{
subscriber.Dispose();
}

foreach (var definition in CommandDefinitions)
foreach (var definition in CommandDefinitions.ToList())
{
CommandManager.RemoveCommand(definition);
}

foreach (var timer in Timers)
foreach (var timer in Timers.ToList())
{
timer.Kill();
}
Expand Down
7 changes: 7 additions & 0 deletions managed/CounterStrikeSharp.API/Core/FunctionReference.cs
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ public class FunctionReference

private readonly Delegate _targetMethod;
private readonly CallbackDelegate _nativeCallback;
private readonly GCHandle _nativeCallbackHandle;

private readonly TaskCompletionSource _taskCompletionSource = new();

Expand All @@ -57,6 +58,7 @@ private FunctionReference(Delegate method, FunctionLifetime lifetime)
Lifetime = lifetime;
_targetMethod = method;
_nativeCallback = CreateWrappedCallback();
_nativeCallbackHandle = GCHandle.Alloc(_nativeCallback);
}

/// <summary>
Expand Down Expand Up @@ -178,6 +180,11 @@ public static void Remove(int reference)

IdToFunctionReferencesMap.Remove(reference, out _);

if (functionReference._nativeCallbackHandle.IsAllocated)
{
functionReference._nativeCallbackHandle.Free();
}

Application.Instance.Logger.LogDebug("Removing function/callback reference: {Reference}", reference);
}
}
Expand Down