[Bug] Loop on Controller Disconnect

[h3kt0rx]

Prerequisites

• I am confident that my issue has not been reported already in open OR closed issues.
• I am able to reliably reproduce the issue on the latest stable or canary version.
• I am not using an unofficial build (Flatpak, Emudeck, etc.).
• I am a silly goose and didn't read these boxes.
• I am a silly goose and DID read these boxes.

Description of the issue

During multiplayer game with 2 or more controllers connected, when the controller for Player 2, 3 or 4 disconnects, Controller 1 assumes control ONLY when any action buttons (A/B/X/Y) are pressed. It does not assume Control when other buttons are pressed.

Reproduction steps

Playing Kirby Star Allies. (Or other game with 2+ player support)

1. Connect 2+ Controllers.
2. Enter any level and join players 2+.
3. Turn off or Disconnect controller 2, 3, or 4.
4. Press A to allow CPU play when prompted for disconnected controller.
5. Press any action button (A/B/X/Y)
6. Player 1 is now in control of any of the players that disconnected.

Log file

Ryujinx_1.3.3_2026-03-24_23-07-25.log

OS

Windows 11

Ryujinx version

1.3.3

Game version

4.0.0

CPU

Intel 2600k

GPU

NVIDIA 3060 Ti

RAM

16 GB

List of applied mods

No response

Additional context?

No response

[h3kt0rx]

Built and tested after making these changes and it fixed it for me

File:
src\Ryujinx.Input\HLE\NpadManager.cs

Before:

                    inputState.PlayerId = playerIndex;
                    motionState.Item1.PlayerId = playerIndex;

                    _hleInputStates.Add(inputState);
                    _hleMotionStates.Add(motionState.Item1);

After:

                    inputState.PlayerId = playerIndex;
                    motionState.Item1.PlayerId = playerIndex;

                    if (!_blockInputUpdates && controller != null)
                    {
                        _hleInputStates.Add(inputState);
                    }

                    _hleMotionStates.Add(motionState.Item1);

Probably not the proper fix though. Moving the 4 lines into this if block above it would be the right way maybe?

if (!_blockInputUpdates && controller != null)