From 4b3d6384b694af51b44b0e7b8aeafc46c82c54e2 Mon Sep 17 00:00:00 2001 From: ameerj <52414509+ameerj@users.noreply.github.com> Date: Sat, 12 Nov 2022 22:34:37 -0500 Subject: [PATCH] config: Always apply input profile's controller type --- src/yuzu/configuration/config.cpp | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp index 343f3b8e50..1fa88e4b4b 100644 --- a/src/yuzu/configuration/config.cpp +++ b/src/yuzu/configuration/config.cpp @@ -195,28 +195,17 @@ void Config::ReadPlayerValue(std::size_t player_index) { auto& player = Settings::values.players.GetValue()[player_index]; - if (player_prefix.isEmpty()) { - const auto controller = static_cast( - qt_config - ->value(QStringLiteral("%1type").arg(player_prefix), - static_cast(Settings::ControllerType::ProController)) - .toUInt()); + player.controller_type = static_cast( + qt_config + ->value(QStringLiteral("%1type").arg(player_prefix), + static_cast(Settings::ControllerType::ProController)) + .toUInt()); - if (controller == Settings::ControllerType::LeftJoycon || - controller == Settings::ControllerType::RightJoycon) { - player.controller_type = controller; - } - } else { + if (!player_prefix.isEmpty()) { player.connected = ReadSetting(QStringLiteral("%1connected").arg(player_prefix), player_index == 0) .toBool(); - player.controller_type = static_cast( - qt_config - ->value(QStringLiteral("%1type").arg(player_prefix), - static_cast(Settings::ControllerType::ProController)) - .toUInt()); - player.vibration_enabled = qt_config->value(QStringLiteral("%1vibration_enabled").arg(player_prefix), true) .toBool();