diff options
author | bunnei <bunneidev@gmail.com> | 2023-02-26 22:18:25 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-26 22:18:25 -0800 |
commit | 2b4ba9032920c408527985a493467063cf405a2e (patch) | |
tree | 0be3e8dfec5f9df92c38e3bba7b632751ad57379 /src/yuzu/configuration/config.cpp | |
parent | 26c1edf2f083399a594a834bdd36be85369819f7 (diff) | |
parent | ff11fdb07e7264f21b45e23b852bc1c51c870f5c (diff) |
Merge pull request #9871 from yuzu-emu/revert-9824-burning-profiles
Revert "yuzu: config: Remove player 8 and 9 from config file"
Diffstat (limited to 'src/yuzu/configuration/config.cpp')
-rw-r--r-- | src/yuzu/configuration/config.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp index 4dad83b75..bb731276e 100644 --- a/src/yuzu/configuration/config.cpp +++ b/src/yuzu/configuration/config.cpp @@ -212,11 +212,16 @@ void Config::ReadPlayerValue(std::size_t player_index) { } if (player_prefix.isEmpty() && Settings::IsConfiguringGlobal()) { - player.controller_type = static_cast<Settings::ControllerType>( + const auto controller = static_cast<Settings::ControllerType>( qt_config ->value(QStringLiteral("%1type").arg(player_prefix), static_cast<u8>(Settings::ControllerType::ProController)) .toUInt()); + + if (controller == Settings::ControllerType::LeftJoycon || + controller == Settings::ControllerType::RightJoycon) { + player.controller_type = controller; + } } else { player.connected = ReadSetting(QStringLiteral("%1connected").arg(player_prefix), player_index == 0) |