Skip to content

Commit 3ebbcd6

Browse files
committed
Merge branch 'isxb-1767-exceptions-when-disconnecting-device' of github.com:Unity-Technologies/InputSystem into isxb-1767-exceptions-when-disconnecting-device
2 parents 4c9cec5 + f939171 commit 3ebbcd6

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

Packages/com.unity.inputsystem/InputSystem/Actions/InputActionState.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1153,7 +1153,7 @@ private void EnableControls(int mapIndex, int controlStartIndex, int numControls
11531153
if (IsControlEnabled(controlIndex))
11541154
continue;
11551155

1156-
// We might en up here if an action map is enabled from e.g. an event processing callback such as
1156+
// We might end up here if an action map is enabled from e.g. an event processing callback such as
11571157
// InputAction.cancel event handler (ISXB-1766). In this case we must skip controls associated with
11581158
// a device that is not connected to the system (Have deviceIndex < 0). We check this here to not
11591159
// cause side effects if aborting later in the call-chain.

0 commit comments

Comments
 (0)