diff --git a/Source/Engine/Engine/InputAxis.cs b/Source/Engine/Engine/InputAxis.cs index ca77d2465..a0c916e65 100644 --- a/Source/Engine/Engine/InputAxis.cs +++ b/Source/Engine/Engine/InputAxis.cs @@ -60,6 +60,7 @@ namespace FlaxEngine ~InputAxis() { Input.AxisValueChanged -= Handler; + ValueChanged = null; } /// @@ -68,6 +69,7 @@ namespace FlaxEngine public void Dispose() { Input.AxisValueChanged -= Handler; + ValueChanged = null; GC.SuppressFinalize(this); } diff --git a/Source/Engine/Engine/InputEvent.cs b/Source/Engine/Engine/InputEvent.cs index e5653631f..05e71463b 100644 --- a/Source/Engine/Engine/InputEvent.cs +++ b/Source/Engine/Engine/InputEvent.cs @@ -70,6 +70,10 @@ namespace FlaxEngine ~InputEvent() { Input.ActionTriggered -= Handler; + Triggered = null; + Pressed = null; + Pressing = null; + Released = null; } private void Handler(string name, InputActionState state) @@ -100,6 +104,10 @@ namespace FlaxEngine public void Dispose() { Input.ActionTriggered -= Handler; + Triggered = null; + Pressed = null; + Pressing = null; + Released = null; GC.SuppressFinalize(this); }