mirror of
https://git.ryujinx.app/ryubing/ryujinx.git
synced 2026-05-28 07:59:17 +00:00
Compare commits
1 Commits
Canary-1.3
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
fa72b5a298 |
@@ -155,9 +155,7 @@ namespace Ryujinx.Input.SDL3
|
|||||||
result |= GamepadFeaturesFlag.Led;
|
result |= GamepadFeaturesFlag.Led;
|
||||||
}
|
}
|
||||||
SDL_UnlockProperties(propID);
|
SDL_UnlockProperties(propID);
|
||||||
|
SDL_DestroyProperties(propID);
|
||||||
// NOTE: Do not call SDL_DestroyProperties here. These properties are owned
|
|
||||||
// internally by SDL and are freed when SDL_CloseGamepad is called (in Dispose).
|
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -331,18 +331,28 @@ namespace Ryujinx.Input.SDL3
|
|||||||
|
|
||||||
public IEnumerable<IGamepad> GetGamepads()
|
public IEnumerable<IGamepad> GetGamepads()
|
||||||
{
|
{
|
||||||
string[] ids;
|
lock (_gamepadsIds)
|
||||||
lock (_lock)
|
|
||||||
{
|
{
|
||||||
ids = _gamepadsIds.Values
|
foreach (var gamepad in _gamepadsIds)
|
||||||
.Concat(_joyConsIds.Values)
|
{
|
||||||
.Concat(_linkedJoyConsIds.Values)
|
yield return GetGamepad(gamepad.Value);
|
||||||
.ToArray();
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach (string id in ids)
|
lock (_joyConsIds)
|
||||||
{
|
{
|
||||||
yield return GetGamepad(id);
|
foreach (var gamepad in _joyConsIds)
|
||||||
|
{
|
||||||
|
yield return GetGamepad(gamepad.Value);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
lock (_linkedJoyConsIds)
|
||||||
|
{
|
||||||
|
foreach (var gamepad in _linkedJoyConsIds)
|
||||||
|
{
|
||||||
|
yield return GetGamepad(gamepad.Value);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -561,6 +561,7 @@ namespace Ryujinx.Input.HLE
|
|||||||
!controllerConfig.Rumble.EnableRumble)
|
!controllerConfig.Rumble.EnableRumble)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
VibrationValue leftVibrationValue = dualVibrationValue.Item1;
|
VibrationValue leftVibrationValue = dualVibrationValue.Item1;
|
||||||
|
|||||||
Reference in New Issue
Block a user