Merge branch 'Tryibion-input-rem-dispose'

This commit is contained in:
Wojtek Figat
2024-08-21 22:56:17 +02:00
2 changed files with 10 additions and 0 deletions

View File

@@ -60,6 +60,7 @@ namespace FlaxEngine
~InputAxis() ~InputAxis()
{ {
Input.AxisValueChanged -= Handler; Input.AxisValueChanged -= Handler;
ValueChanged = null;
} }
/// <summary> /// <summary>
@@ -68,6 +69,7 @@ namespace FlaxEngine
public void Dispose() public void Dispose()
{ {
Input.AxisValueChanged -= Handler; Input.AxisValueChanged -= Handler;
ValueChanged = null;
GC.SuppressFinalize(this); GC.SuppressFinalize(this);
} }

View File

@@ -70,6 +70,10 @@ namespace FlaxEngine
~InputEvent() ~InputEvent()
{ {
Input.ActionTriggered -= Handler; Input.ActionTriggered -= Handler;
Triggered = null;
Pressed = null;
Pressing = null;
Released = null;
} }
private void Handler(string name, InputActionState state) private void Handler(string name, InputActionState state)
@@ -100,6 +104,10 @@ namespace FlaxEngine
public void Dispose() public void Dispose()
{ {
Input.ActionTriggered -= Handler; Input.ActionTriggered -= Handler;
Triggered = null;
Pressed = null;
Pressing = null;
Released = null;
GC.SuppressFinalize(this); GC.SuppressFinalize(this);
} }