mirrors/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Hacky fix on opening setting window multiple times with per-game settings

Browse source
This commit is contained in:
WilliamWsyHK 2024-05-18 11:12:57 +08:00
commit a398575513
1 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/Ryujinx/AppHost.cs
View file

@ -1253,41 +1253,45 @@ namespace Ryujinx.Ava
{ {
KeyboardHotkeyState state = KeyboardHotkeyState.None; KeyboardHotkeyState state = KeyboardHotkeyState.None;
KeyboardHotkeys hotkeys = ConfigurationState.Instance(UseTitleConfiguration).Hid.Hotkeys.Value; ReactiveObject<KeyboardHotkeys> hotkeys = ConfigurationState.Instance(UseTitleConfiguration).Hid.Hotkeys;
if (hotkeys.Value == null)
{
Thread.Sleep(500);
}
if (_keyboardInterface.IsPressed((Key)hotkeys.ToggleVsync)) if (_keyboardInterface.IsPressed((Key)hotkeys.Value!.ToggleVsync))
{ {
state = KeyboardHotkeyState.ToggleVSync; state = KeyboardHotkeyState.ToggleVSync;
} }
else if (_keyboardInterface.IsPressed((Key)hotkeys.Screenshot)) else if (_keyboardInterface.IsPressed((Key)hotkeys.Value.Screenshot))
{ {
state = KeyboardHotkeyState.Screenshot; state = KeyboardHotkeyState.Screenshot;
} }
else if (_keyboardInterface.IsPressed((Key)hotkeys.ShowUI)) else if (_keyboardInterface.IsPressed((Key)hotkeys.Value.ShowUI))
{ {
state = KeyboardHotkeyState.ShowUI; state = KeyboardHotkeyState.ShowUI;
} }
else if (_keyboardInterface.IsPressed((Key)hotkeys.Pause)) else if (_keyboardInterface.IsPressed((Key)hotkeys.Value.Pause))
{ {
state = KeyboardHotkeyState.Pause; state = KeyboardHotkeyState.Pause;
} }
else if (_keyboardInterface.IsPressed((Key)hotkeys.ToggleMute)) else if (_keyboardInterface.IsPressed((Key)hotkeys.Value.ToggleMute))
{ {
state = KeyboardHotkeyState.ToggleMute; state = KeyboardHotkeyState.ToggleMute;
} }
else if (_keyboardInterface.IsPressed((Key)hotkeys.ResScaleUp)) else if (_keyboardInterface.IsPressed((Key)hotkeys.Value.ResScaleUp))
{ {
state = KeyboardHotkeyState.ResScaleUp; state = KeyboardHotkeyState.ResScaleUp;
} }
else if (_keyboardInterface.IsPressed((Key)hotkeys.ResScaleDown)) else if (_keyboardInterface.IsPressed((Key)hotkeys.Value.ResScaleDown))
{ {
state = KeyboardHotkeyState.ResScaleDown; state = KeyboardHotkeyState.ResScaleDown;
} }
else if (_keyboardInterface.IsPressed((Key)hotkeys.VolumeUp)) else if (_keyboardInterface.IsPressed((Key)hotkeys.Value.VolumeUp))
{ {
state = KeyboardHotkeyState.VolumeUp; state = KeyboardHotkeyState.VolumeUp;
} }
else if (_keyboardInterface.IsPressed((Key)hotkeys.VolumeDown)) else if (_keyboardInterface.IsPressed((Key)hotkeys.Value.VolumeDown))
{ {
state = KeyboardHotkeyState.VolumeDown; state = KeyboardHotkeyState.VolumeDown;
} }