Fixed an issue where resetting an action via InputAction.Reset() while being in disabled state would prevent the action from being enabled again. (#1419)

Author: ekcoh

Assets/Tests/InputSystem/CoreTests_Actions.cs

@@ -8792,6 +8792,41 @@ public void Actions_CanResetAction()
         }
     }
 
+    // Corresponds to bug report ticket 1370732.
+    [Test]
+    [Category("Actions")]
+    public void Actions_ResetShouldPreserveEnabledState__IfResetWhileInDisabledState()
+    {
+        var gamepad = InputSystem.AddDevice<Gamepad>();
+
+        InputSystem.settings.defaultDeadzoneMin = 0;
+        InputSystem.settings.defaultDeadzoneMax = 1;
+
+        var action = new InputAction(type: InputActionType.Value, binding: "<Gamepad>/leftStick");
+        action.Enable();
+        Assert.That(action.enabled, Is.True);
+
+        action.Disable();
+        Assert.That(action.enabled, Is.False);
+
+        action.Reset();
+        Assert.That(action.enabled, Is.False);
+
+        action.Enable();
+        Assert.That(action.enabled, Is.True);
+
+        using (var trace = new InputActionTrace(action))
+        {
+            Set(gamepad.leftStick, new Vector2(0.2f, 0.3f));
+
+            Assert.That(action.inProgress, Is.True);
+            Assert.That(action.ReadValue<Vector2>(), Is.EqualTo(new Vector2(0.2f, 0.3f)));
+            Assert.That(trace,
+                Started(action, value: new Vector2(0.2f, 0.3f))
+                    .AndThen(Performed(action, value: new Vector2(0.2f, 0.3f))));
+        }
+    }
+
     private class MonoBehaviourWithActionProperty : MonoBehaviour
     {
         public InputActionProperty actionProperty;

Packages/com.unity.inputsystem/CHANGELOG.md

@@ -24,6 +24,7 @@ however, it has to be formatted properly to pass verification tests.
 - Fixed a problem where only using runtimes that are not XR supported causes a compile error.This fix adds back in ENABLE_VR checks to prevent this case (case 1368300)
 - Fixed input action for Android gamepad's right stick will be correctly invoked when only y axis is changing ([case 1308637](https://issuetracker.unity3d.com/issues/android-input-system-right-analog-stick-tracking-is-erratic-when-using-a-gamepad-connected-to-an-android-device)).
 - Generic gamepad short display button names where incorrectly mapped on Switch (`A` instead of `B`, etc).
+- Fixed an issue where resetting an action via `InputAction.Reset()` while being in disabled state would prevent the action from being enabled again. ([case 1370732](https://issuetracker.unity3d.com/product/unity/issues/guid/1370732/)).
 - Fixed "Default constructor not found for type UnityEngine.InputSystem.iOS.LowLevel.iOSStepCounter" any other potential exceptions due to classes, methods, fields and properties being stripped when managed stripping setting set to medium or high ([case 1368761](https://issuetracker.unity3d.com/issues/ios-new-input-system-iosstepcounter-crash-on-launch-with-managed-stripping)).
 
 ### Added

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

@@ -1032,13 +1032,17 @@ public unsafe object ReadValueAsObject()
         /// <remarks>
         /// This method can be used to forcibly cancel an action even while it is in progress. Note that unlike
         /// disabling an action, for example, this also effects APIs such as <see cref="WasPressedThisFrame"/>.
+        ///
+        /// Note that invoking this method will not modify enabled state.
         /// </remarks>
         /// <seealso cref="inProgress"/>
         /// <seealso cref="phase"/>
+        /// <seealso cref="Enable"/>
+        /// <seealso cref="Disable"/>
         public void Reset()
         {
             var state = GetOrCreateActionMap().m_State;
-            state?.ResetActionState(m_ActionIndexInState, hardReset: true);
+            state?.ResetActionState(m_ActionIndexInState, toPhase: enabled ? InputActionPhase.Waiting : InputActionPhase.Disabled, hardReset: true);
         }
 
         /// <summary>