crafterpika/ryujinx
1
0
Fork 0
mirror of https://git.ryujinx.app/ryubing/ryujinx.git synced 2025-04-21 18:13:14 +02:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: crafterpika:9b0b2766bd621d1fef209fd65385181324f50f56
Branches Tags
crafterpika:master
crafterpika:update/dotnet/10
crafterpika:fix/handheld-always-ignored-in-headless
crafterpika:removal/ims
crafterpika:metal
crafterpika:Canary-1.3.31
crafterpika:Canary-1.3.30
...
compare: crafterpika:c01f5ac68f331cd75affe03d5ce93a6113a66e02
Branches Tags
crafterpika:master
crafterpika:update/dotnet/10
crafterpika:fix/handheld-always-ignored-in-headless
crafterpika:removal/ims
crafterpika:metal
crafterpika:Canary-1.3.31
crafterpika:Canary-1.3.30

2 commits
9b0b2766bd ... c01f5ac68f

Author SHA1 Message Date
Goodfeat
c01f5ac68f Merge branch 'Master_PR' into 'master' 
Improvements and fixes to issues in the controller input menu

See merge request ryubing/ryujinx!2
 2025-04-19 21:28:55 -05:00
Vova
f46fba4a15 Removed an extra check where the gamepad connection message could appear along with the gamepad settings. 
Fixed: Added configuration preload to avoid an error when returning to the initial state when the paired gamepad is disconnected
 2025-04-20 12:27:47 +10:00
1 changed files with 9 additions and 7 deletions
Show stats Expand all files Collapse all files

16
src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs
View file

@ -349,7 +349,6 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
ConfigViewModel = new ControllerInputViewModel(this, new GamepadInputConfig(controllerInputConfig), VisualStick); ConfigViewModel = new ControllerInputViewModel(this, new GamepadInputConfig(controllerInputConfig), VisualStick);
} }
FindPairedDeviceInConfigFile();
} }
private void FindPairedDeviceInConfigFile() private void FindPairedDeviceInConfigFile()
@ -483,7 +482,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
RevertChanges(); RevertChanges();
_isChangeTrackingActive = true;// Enable configuration change tracking _isChangeTrackingActive = true;// Enable configuration change tracking
} }
private string GetCurrentGamepadId() private string GetCurrentGamepadId()
@ -946,11 +945,14 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
public void RevertChanges() public void RevertChanges()
{ {
Device = Devices.ToList().FindIndex(d => d.Id == RevertDeviceId); LoadConfiguration(); // configuration preload is required if the paired gamepad was disconnected but was changed to another gamepad
LoadDevice(); Device = Devices.ToList().FindIndex(d => d.Id == RevertDeviceId);
LoadConfiguration();
OnPropertyChanged(); LoadDevice();
IsModified = false; LoadConfiguration();
OnPropertyChanged();
IsModified = false;
} }
public void Save() public void Save()