RadsammyT/suyu
1
0
Fork 0
forked from suyu/suyu
Code Pull requests Activity Actions

Merge pull request #5870 from german77/hanheldfix2

Browse source 
config: Always update handheld config
This commit is contained in:
bunnei 2021-02-03 19:02:59 -08:00 committed by GitHub
commit b331bb5210
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/yuzu/configuration/configure_input_player.cpp
View file

@ -580,9 +580,7 @@ void ConfigureInputPlayer::ApplyConfiguration() {
if (player_index == 0) { if (player_index == 0) {
auto& handheld = Settings::values.players.GetValue()[HANDHELD_INDEX]; auto& handheld = Settings::values.players.GetValue()[HANDHELD_INDEX];
const auto handheld_connected = handheld.connected; const auto handheld_connected = handheld.connected;
if (player.controller_type == Settings::ControllerType::Handheld) {
handheld = player; handheld = player;
}
handheld.connected = handheld_connected; handheld.connected = handheld_connected;
} }
} }
@ -596,7 +594,7 @@ void ConfigureInputPlayer::TryConnectSelectedController() {
controller_type != Settings::ControllerType::Handheld; controller_type != Settings::ControllerType::Handheld;
// Connect Handheld depending on Player 1's controller configuration. // Connect Handheld depending on Player 1's controller configuration.
if (player_index == 0 && controller_type == Settings::ControllerType::Handheld) { if (player_index == 0) {
auto& handheld = Settings::values.players.GetValue()[HANDHELD_INDEX]; auto& handheld = Settings::values.players.GetValue()[HANDHELD_INDEX];
const auto handheld_connected = ui->groupConnectedController->isChecked() && const auto handheld_connected = ui->groupConnectedController->isChecked() &&
controller_type == Settings::ControllerType::Handheld; controller_type == Settings::ControllerType::Handheld;