deadcade/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Miria: Do not try to query keyboard input when controller isn't set (#2231)

Browse source 
This fix a possible crash with raw keyboard input since Miria.
I took the liberty to move the the keyboard update to avoid possible duplicate update if we end up having two keyboards in use.
This commit is contained in:
Mary 2021-04-21 01:47:49 +02:00 committed by GitHub
parent 4770cfa920
commit c1cbdd45dc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Ryujinx.Input/HLE/NpadManager.cs
View file

@ -140,6 +140,8 @@ namespace Ryujinx.Input.HLE
List<GamepadInput> hleInputStates = new List<GamepadInput>(); List<GamepadInput> hleInputStates = new List<GamepadInput>();
List<SixAxisInput> hleMotionStates = new List<SixAxisInput>(NpadDevices.MaxControllers); List<SixAxisInput> hleMotionStates = new List<SixAxisInput>(NpadDevices.MaxControllers);
KeyboardInput? hleKeyboardInput = null;
foreach (InputConfig inputConfig in _inputConfig) foreach (InputConfig inputConfig in _inputConfig)
{ {
GamepadInput inputState = default; GamepadInput inputState = default;
@ -160,6 +162,11 @@ namespace Ryujinx.Input.HLE
inputState.Buttons |= hleHid.UpdateStickButtons(inputState.LStick, inputState.RStick); inputState.Buttons |= hleHid.UpdateStickButtons(inputState.LStick, inputState.RStick);
motionState = controller.GetHLEMotionState(); motionState = controller.GetHLEMotionState();
if (ConfigurationState.Instance.Hid.EnableKeyboard)
{
hleKeyboardInput = controller.GetHLEKeyboardInput();
}
} }
else else
{ {
@ -172,20 +179,16 @@ namespace Ryujinx.Input.HLE
hleInputStates.Add(inputState); hleInputStates.Add(inputState);
hleMotionStates.Add(motionState); hleMotionStates.Add(motionState);
}
if (ConfigurationState.Instance.Hid.EnableKeyboard) hleHid.Npads.Update(hleInputStates);
{ hleHid.Npads.UpdateSixAxis(hleMotionStates);
KeyboardInput? hleKeyboardInput = controller.GetHLEKeyboardInput();
if (hleKeyboardInput.HasValue) if (hleKeyboardInput.HasValue)
{ {
hleHid.Keyboard.Update(hleKeyboardInput.Value); hleHid.Keyboard.Update(hleKeyboardInput.Value);
} }
}
}
hleHid.Npads.Update(hleInputStates);
hleHid.Npads.UpdateSixAxis(hleMotionStates);
tamperMachine.UpdateInput(hleInputStates); tamperMachine.UpdateInput(hleInputStates);
} }
} }