Compare commits

..

2 commits

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

View file

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