UI: fix: when switching players, it would show old config

When switching between players' gamepads while saving settings, then
returning to the previous player, the settings show the default settings
instead of the actual settings applied
This commit is contained in:
Vladimir Sokolov 2024-11-10 15:24:17 +10:00 committed by KeatonTheBot
parent 7284f4aa67
commit c0b62e47df
7 changed files with 127 additions and 8 deletions

View file

@ -44,6 +44,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
private readonly MainWindow _mainWindow;
private PlayerIndex _playerId;
private PlayerIndex _playerIdChoose;
private int _controller;
private int _controllerNumber;
private string _controllerImage;
@ -84,6 +85,12 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
}
}
public PlayerIndex PlayerIdChoose
{
get => _playerIdChoose;
set { }
}
public PlayerIndex PlayerId
{
get => _playerId;
@ -91,6 +98,8 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
{
if (IsModified)
{
_playerIdChoose = value;
return;
}
@ -100,7 +109,9 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
if (!Enum.IsDefined(typeof(PlayerIndex), _playerId))
{
_playerId = PlayerIndex.Player1;
}
_isLoaded = false;
LoadConfiguration();
LoadDevice();