diff options
| author | 2021-02-03 19:02:59 -0800 | |
|---|---|---|
| committer | 2021-02-03 19:02:59 -0800 | |
| commit | b331bb5210173cfa3087a80fc6c02ba1a34475a8 (patch) | |
| tree | bbf771a98a7218a21839d6fe6f64319389d334d2 /src | |
| parent | Merge pull request #5863 from ogniK5377/disable-reverb (diff) | |
| parent | Always update handheld config (diff) | |
| download | yuzu-b331bb5210173cfa3087a80fc6c02ba1a34475a8.tar.gz yuzu-b331bb5210173cfa3087a80fc6c02ba1a34475a8.tar.xz yuzu-b331bb5210173cfa3087a80fc6c02ba1a34475a8.zip | |
Merge pull request #5870 from german77/hanheldfix2
config: Always update handheld config
Diffstat (limited to '')
| -rw-r--r-- | src/yuzu/configuration/configure_input_player.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/yuzu/configuration/configure_input_player.cpp b/src/yuzu/configuration/configure_input_player.cpp index fbe36046b..1ab5bcbb9 100644 --- a/src/yuzu/configuration/configure_input_player.cpp +++ b/src/yuzu/configuration/configure_input_player.cpp | |||
| @@ -580,9 +580,7 @@ void ConfigureInputPlayer::ApplyConfiguration() { | |||
| 580 | if (player_index == 0) { | 580 | if (player_index == 0) { |
| 581 | auto& handheld = Settings::values.players.GetValue()[HANDHELD_INDEX]; | 581 | auto& handheld = Settings::values.players.GetValue()[HANDHELD_INDEX]; |
| 582 | const auto handheld_connected = handheld.connected; | 582 | const auto handheld_connected = handheld.connected; |
| 583 | if (player.controller_type == Settings::ControllerType::Handheld) { | 583 | handheld = player; |
| 584 | handheld = player; | ||
| 585 | } | ||
| 586 | handheld.connected = handheld_connected; | 584 | handheld.connected = handheld_connected; |
| 587 | } | 585 | } |
| 588 | } | 586 | } |
| @@ -596,7 +594,7 @@ void ConfigureInputPlayer::TryConnectSelectedController() { | |||
| 596 | controller_type != Settings::ControllerType::Handheld; | 594 | controller_type != Settings::ControllerType::Handheld; |
| 597 | 595 | ||
| 598 | // Connect Handheld depending on Player 1's controller configuration. | 596 | // Connect Handheld depending on Player 1's controller configuration. |
| 599 | if (player_index == 0 && controller_type == Settings::ControllerType::Handheld) { | 597 | if (player_index == 0) { |
| 600 | auto& handheld = Settings::values.players.GetValue()[HANDHELD_INDEX]; | 598 | auto& handheld = Settings::values.players.GetValue()[HANDHELD_INDEX]; |
| 601 | const auto handheld_connected = ui->groupConnectedController->isChecked() && | 599 | const auto handheld_connected = ui->groupConnectedController->isChecked() && |
| 602 | controller_type == Settings::ControllerType::Handheld; | 600 | controller_type == Settings::ControllerType::Handheld; |