diff options
author | Narr the Reg <juangerman-13@hotmail.com> | 2023-02-26 21:39:13 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-26 21:39:13 +0100 |
commit | ff11fdb07e7264f21b45e23b852bc1c51c870f5c (patch) | |
tree | 0be3e8dfec5f9df92c38e3bba7b632751ad57379 /src/yuzu/configuration/config.cpp | |
parent | Merge pull request #9849 from ameerj/async-astc (diff) | |
download | yuzu-ff11fdb07e7264f21b45e23b852bc1c51c870f5c.tar yuzu-ff11fdb07e7264f21b45e23b852bc1c51c870f5c.tar.gz yuzu-ff11fdb07e7264f21b45e23b852bc1c51c870f5c.tar.bz2 yuzu-ff11fdb07e7264f21b45e23b852bc1c51c870f5c.tar.lz yuzu-ff11fdb07e7264f21b45e23b852bc1c51c870f5c.tar.xz yuzu-ff11fdb07e7264f21b45e23b852bc1c51c870f5c.tar.zst yuzu-ff11fdb07e7264f21b45e23b852bc1c51c870f5c.zip |
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) |