Skip to content

Make sure InputEventPtr is valid when marking it as handled #1601

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andrew-oc merged 1 commit into from
Oct 25, 2022
Merged

Make sure InputEventPtr is valid when marking it as handled #1601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions Packages/com.unity.inputsystem/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ however, it has to be formatted properly to pass verification tests.
- Fixed `ArgumentNullException` when opening the Prefab Overrides window and selecting a component with an `InputAction`.
- Fixed `{fileID: 0}` getting appended to `ProjectSettings.asset` file when building a project ([case ISXB-296](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-296)).
- Fixed `Type of instance in array does not match expected type` assertion when using PlayerInput in combination with Control Schemes and Interactions ([case ISXB-282](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-282)).
- Fixed an InvalidOperationException when using Hold interaction, and by extension any interaction that changes to performed state after a timeout ([case ISXB-332](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-330)).

## [1.4.3] - 2022-09-23

Expand Down
6 changes: 5 additions & 1 deletion Packages/com.unity.inputsystem/InputSystem/Actions/InputActionState.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2403,7 +2403,11 @@ private void ChangePhaseOfActionInternal(int actionIndex, TriggerState* actionSt
// When we perform an action, we mark the event handled such that FireStateChangeNotifications()
// can then reset state monitors in the same group.
// NOTE: We don't consume for controls at binding complexity 1. Those we fire in unison.
if (controlGroupingAndComplexity[trigger.controlIndex * 2 + 1] > 1)
if (controlGroupingAndComplexity[trigger.controlIndex * 2 + 1] > 1 &&
// we can end up switching to performed state from an interaction with a timeout, at which point
// the original event will probably have been removed from memory, so make sure to check
// we still have one
m_CurrentlyProcessingThisEvent.valid)
m_CurrentlyProcessingThisEvent.handled = true;
}
else if (newPhase == InputActionPhase.Canceled)
Expand Down