Skip to content
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

Jump to bottom

Fix phantom configured controllers #3720

Merged
merged 1 commit into from Oct 16, 2022
Merged

Fix phantom configured controllers #3720

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 14 additions & 2 deletions Ryujinx.Input/HLE/NpadManager.cs
View file
Open in desktop
Expand Up @@ -51,7 +51,16 @@ private void RefreshInputConfigForHLE()
{
lock (_lock)
{
_device.Hid.RefreshInputConfig(_inputConfig);
List<InputConfig> validInputs = new List<InputConfig>();
foreach (var inputConfigEntry in _inputConfig)
{
if (_controllers[(int)inputConfigEntry.PlayerIndex] != null)
{
validInputs.Add(inputConfigEntry);
}
}

_device.Hid.RefreshInputConfig(validInputs);
}
}

Expand Down Expand Up @@ -103,6 +112,8 @@ public void ReloadConfiguration(List<InputConfig> inputConfig, bool enableKeyboa
_controllers[i] = null;
}

List<InputConfig> validInputs = new List<InputConfig>();

foreach (InputConfig inputConfigEntry in inputConfig)
{
NpadController controller = new NpadController(_cemuHookClient);
Expand All @@ -116,14 +127,15 @@ public void ReloadConfiguration(List<InputConfig> inputConfig, bool enableKeyboa
else
{
_controllers[(int)inputConfigEntry.PlayerIndex] = controller;
validInputs.Add(inputConfigEntry);
}
}

_inputConfig = inputConfig;
_enableKeyboard = enableKeyboard;
_enableMouse = enableMouse;

_device.Hid.RefreshInputConfig(inputConfig);
_device.Hid.RefreshInputConfig(validInputs);
}
}

Expand Down