summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgerman <german@thesoftwareartisans.com>2021-02-04 00:45:41 +0100
committergerman <german@thesoftwareartisans.com>2021-02-04 00:48:04 +0100
commitc1b81f776ca54baf9ebaf1d3a091867ee55d36ce (patch)
tree035aa08b67ab9d04275ac1a9fb2720970df32dfe
parentMerge pull request #5848 from ogniK5377/k-resourcelimit (diff)
downloadyuzu-c1b81f776ca54baf9ebaf1d3a091867ee55d36ce.tar
yuzu-c1b81f776ca54baf9ebaf1d3a091867ee55d36ce.tar.gz
yuzu-c1b81f776ca54baf9ebaf1d3a091867ee55d36ce.tar.bz2
yuzu-c1b81f776ca54baf9ebaf1d3a091867ee55d36ce.tar.lz
yuzu-c1b81f776ca54baf9ebaf1d3a091867ee55d36ce.tar.xz
yuzu-c1b81f776ca54baf9ebaf1d3a091867ee55d36ce.tar.zst
yuzu-c1b81f776ca54baf9ebaf1d3a091867ee55d36ce.zip
-rw-r--r--src/yuzu/configuration/configure_input_player.cpp6
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() {
if (player_index == 0) {
auto& handheld = Settings::values.players.GetValue()[HANDHELD_INDEX];
const auto handheld_connected = handheld.connected;
- if (player.controller_type == Settings::ControllerType::Handheld) {
- handheld = player;
- }
+ handheld = player;
handheld.connected = handheld_connected;
}
}
@@ -596,7 +594,7 @@ void ConfigureInputPlayer::TryConnectSelectedController() {
controller_type != Settings::ControllerType::Handheld;
// 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];
const auto handheld_connected = ui->groupConnectedController->isChecked() &&
controller_type == Settings::ControllerType::Handheld;