FIX: Avoid disabling project-wide actions on shutdown

Assets/Tests/InputSystem/Plugins/InputForUITests.cs

@@ -37,6 +37,7 @@ public class InputForUITests : InputTestFixture
     readonly List<Event> m_InputForUIEvents = new List<Event>();
     private int m_CurrentInputEventToCheck;
     InputSystemProvider m_InputSystemProvider;
+    private bool m_ClearedMockProvider;
 
     private InputActionAsset storedActions;
 
@@ -45,6 +46,7 @@ public override void Setup()
     {
         base.Setup();
         m_CurrentInputEventToCheck = 0;
+        m_ClearedMockProvider = false;
 
         storedActions = InputSystem.actions;
 
@@ -59,7 +61,8 @@ public override void Setup()
     public override void TearDown()
     {
         EventProvider.Unsubscribe(InputForUIOnEvent);
-        EventProvider.ClearMockProvider();
+        if (!m_ClearedMockProvider)
+            EventProvider.ClearMockProvider();
         m_InputForUIEvents.Clear();
 
         InputSystem.s_Manager.actions = storedActions;
@@ -92,6 +95,34 @@ public void InputSystemActionAssetIsNotNull()
             "Test is invalid since InputSystemProvider actions are not available");
     }
 
+    [Test]
+    [Category(kTestCategory)]
+    public void Shutdown_DoesNotDisableProjectWideActionsAsset()
+    {
+        var asset = ScriptableObject.CreateInstance<InputActionAsset>();
+        var uiMap = new InputActionMap("UI");
+        uiMap.AddAction("Point", InputActionType.PassThrough, "<Mouse>/position");
+        uiMap.AddAction("Navigate", InputActionType.PassThrough, "<Gamepad>/leftStick");
+        uiMap.AddAction("Submit", InputActionType.Button, "<Keyboard>/enter");
+        uiMap.AddAction("Cancel", InputActionType.Button, "<Keyboard>/escape");
+        uiMap.AddAction("Click", InputActionType.PassThrough, "<Mouse>/leftButton");
+        uiMap.AddAction("MiddleClick", InputActionType.PassThrough, "<Mouse>/middleButton");
+        uiMap.AddAction("RightClick", InputActionType.PassThrough, "<Mouse>/rightButton");
+        uiMap.AddAction("ScrollWheel", InputActionType.PassThrough, "<Mouse>/scroll");
+        asset.AddActionMap(uiMap);
+
+        InputSystem.s_Manager.actions = asset;
+
+        m_InputSystemProvider.Initialize();
+        Assert.That(asset.enabled, Is.True, "Project-wide actions should be enabled by provider initialization.");
+
+        EventProvider.ClearMockProvider();
+        m_ClearedMockProvider = true;
+        Assert.That(asset.enabled, Is.True, "Project-wide actions must remain enabled after provider shutdown.");
+
+        Object.DestroyImmediate(asset);
+    }
+
     [Test]
     [Category(kTestCategory)]
     // Checks that mouse events are ignored when a touch is active.

Packages/com.unity.inputsystem/InputSystem/Plugins/InputForUI/InputSystemProvider.cs

@@ -664,7 +664,7 @@ void UnregisterActions()
             UnregisterAction(ref m_RightClickAction, OnRightClickPerformed);
             UnregisterAction(ref m_ScrollWheelAction, OnScrollWheelPerformed);
 
-            if (m_InputActionAsset != null)
+            if (m_InputActionAsset != null && m_InputActionAsset != InputSystem.actions)
                 m_InputActionAsset.Disable();
         }