Get rid of _isValid

This commit is contained in:
Isaac Marovitz 2024-04-05 17:37:25 -04:00
commit a8704e54b4
No known key found for this signature in database
GPG key ID: 97250B2B09A132E1

View file

@ -203,8 +203,6 @@ namespace Ryujinx.Input.HLE
new(Key.NumLock, 10), new(Key.NumLock, 10),
}; };
private bool _isValid;
private MotionInput _leftMotionInput; private MotionInput _leftMotionInput;
private MotionInput _rightMotionInput; private MotionInput _rightMotionInput;
@ -222,7 +220,6 @@ namespace Ryujinx.Input.HLE
{ {
State = default; State = default;
Id = null; Id = null;
_isValid = false;
_cemuHookClient = cemuHookClient; _cemuHookClient = cemuHookClient;
} }
@ -234,11 +231,10 @@ namespace Ryujinx.Input.HLE
Id = config.Id; Id = config.Id;
_gamepad = GamepadDriver.GetGamepad(Id); _gamepad = GamepadDriver.GetGamepad(Id);
_isValid = _gamepad != null;
UpdateUserConfiguration(config); UpdateUserConfiguration(config);
return _isValid; return _gamepad != null;
} }
public void UpdateUserConfiguration(InputConfig config) public void UpdateUserConfiguration(InputConfig config)
@ -262,10 +258,7 @@ namespace Ryujinx.Input.HLE
_config = config; _config = config;
if (_isValid) _gamepad?.SetConfiguration(config);
{
_gamepad.SetConfiguration(config);
}
} }
private void UpdateMotionInput(MotionConfigController motionConfig) private void UpdateMotionInput(MotionConfigController motionConfig)
@ -282,7 +275,7 @@ namespace Ryujinx.Input.HLE
public void Update() public void Update()
{ {
if (_isValid && GamepadDriver != null) if (_gamepad != null && GamepadDriver != null)
{ {
State = _gamepad.GetMappedStateSnapshot(); State = _gamepad.GetMappedStateSnapshot();