Просмотр исходного кода

Merge pull request #5870 from german77/hanheldfix2

config: Always update handheld config
bunnei 5 лет назад
Родитель
Сommit
b331bb5210
1 измененных файлов с 2 добавлено и 4 удалено
  1. 2 4
      src/yuzu/configuration/configure_input_player.cpp

+ 2 - 4
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;