MeloNX/Ryujinx-ryubing
11
0
Fork 0
Code Issues 184 Pull Requests 15 Actions Packages Projects Releases 36 Wiki Activity

Pr 434 #523

Closed
krQo0ygT7YVBDW wants to merge 68 commits from pr-434 into master
pull from: pr-434
merge into: MeloNX:master
Conversation 0 Commits 68 Files Changed 29 +4 -5
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1c6390cbfb - Show all commits

1
src/Ryujinx.Input/HLE/NpadManager.cs
View File

@ -229,7 +229,6 @@ namespace Ryujinx.Input.HLE
controller.UpdateUserConfiguration(inputConfig); controller.UpdateUserConfiguration(inputConfig);
specialExit = controller.Update(); //hotkey press check specialExit = controller.Update(); //hotkey press check
controller.UpdateRumble(_device.Hid.Npads.GetRumbleQueue(playerIndex)); controller.UpdateRumble(_device.Hid.Npads.GetRumbleQueue(playerIndex));
inputState = controller.GetHLEInputState(); inputState = controller.GetHLEInputState();

8
src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
View File

@ -516,10 +516,10 @@ namespace Ryujinx.Ava.UI.ViewModels
EnableMouse = config.Hid.EnableMouse; EnableMouse = config.Hid.EnableMouse;
EnableSpecialExit = config.Hid.specialExitEmulator.Value switch EnableSpecialExit = config.Hid.specialExitEmulator.Value switch
{ {
0=> 0, // "Hotkey 'Exit' is Disabled" 0=> 0, // "Hotkey 'Exit' is Disabled"
1=> 1, // "Close app. by hotkey" 1=> 1, // "Close app. by hotkey"
2=> 2, // "Close game by hotkey" 2=> 2, // "Close game by hotkey"
_ => 0 // "Hotkey 'Exit' is Disabled" _=> 0 // "Hotkey 'Exit' is Disabled"
}; };
// Keyboard Hotkeys // Keyboard Hotkeys