mirrors/ryujinx
0
0
Fork 0
mirror of https://git.ryujinx.app/ryubing/ryujinx.git synced 2025-12-26 16:37:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch ryujinx:master into ui-userprofiles-and-misc

Browse source
This commit is contained in:
Neo 2025-11-10 03:14:11 -06:00
commit 1392fcfbc5
5 changed files with 144 additions and 139 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/Ryujinx.Input.SDL3/SDL3GamepadDriver.cs
View file

@ -154,8 +154,14 @@ namespace Ryujinx.Input.SDL3
if (SDL3JoyConPair.IsCombinable(_gamepadsIds))
{
// TODO - It appears that you can only have one joy con pair connected at a time?
// This was also the behavior before SDL3
_gamepadsIds.Remove(GetInstanceIdFromId(SDL3JoyConPair.Id));
_gamepadsIds.Add(joystickInstanceId, SDL3JoyConPair.Id);
uint fakeInstanceID = uint.MaxValue;
while (!_gamepadsIds.TryAdd((SDL_JoystickID)fakeInstanceID, SDL3JoyConPair.Id))
{
fakeInstanceID--;
}
joyConPairConnected = true;
}
}

2
src/Ryujinx.Input.SDL3/SDL3JoyConPair.cs
View file

@ -110,7 +110,7 @@ namespace Ryujinx.Input.SDL3
.ToDictionary();
SDL_JoystickID idx;
int leftIndex = gamepadNames.TryGetValue(SDL3JoyCon.LeftName, out idx) ? (int)idx : -1;
int rightIndex = gamepadNames.TryGetValue(SDL3JoyCon.LeftName, out idx) ? (int)idx : -1;
int rightIndex = gamepadNames.TryGetValue(SDL3JoyCon.RightName, out idx) ? (int)idx : -1;
return (leftIndex, rightIndex);
}