diff options
Diffstat (limited to 'src/yuzu/configuration')
| -rw-r--r-- | src/yuzu/configuration/configure_input_player.cpp | 15 | ||||
| -rw-r--r-- | src/yuzu/configuration/configure_per_game.cpp | 24 |
2 files changed, 17 insertions, 22 deletions
diff --git a/src/yuzu/configuration/configure_input_player.cpp b/src/yuzu/configuration/configure_input_player.cpp index 8c6249fc2..b9342466e 100644 --- a/src/yuzu/configuration/configure_input_player.cpp +++ b/src/yuzu/configuration/configure_input_player.cpp @@ -747,15 +747,16 @@ void ConfigureInputPlayer::UpdateInputDeviceCombobox() { const auto first_engine = devices[0].Get("engine", ""); const auto first_guid = devices[0].Get("guid", ""); const auto first_port = devices[0].Get("port", 0); + const auto first_pad = devices[0].Get("pad", 0); if (devices.size() == 1) { - const auto devices_it = - std::find_if(input_devices.begin(), input_devices.end(), - [first_engine, first_guid, first_port](const Common::ParamPackage param) { - return param.Get("engine", "") == first_engine && - param.Get("guid", "") == first_guid && - param.Get("port", 0) == first_port; - }); + const auto devices_it = std::find_if( + input_devices.begin(), input_devices.end(), + [first_engine, first_guid, first_port, first_pad](const Common::ParamPackage param) { + return param.Get("engine", "") == first_engine && + param.Get("guid", "") == first_guid && param.Get("port", 0) == first_port && + param.Get("pad", 0) == first_pad; + }); const int device_index = devices_it != input_devices.end() ? static_cast<int>(std::distance(input_devices.begin(), devices_it)) diff --git a/src/yuzu/configuration/configure_per_game.cpp b/src/yuzu/configuration/configure_per_game.cpp index 12699c126..f4cf25f05 100644 --- a/src/yuzu/configuration/configure_per_game.cpp +++ b/src/yuzu/configuration/configure_per_game.cpp @@ -45,20 +45,21 @@ ConfigurePerGame::ConfigurePerGame(QWidget* parent, u64 title_id, const std::string& file_name, Core::System& system_) : QDialog(parent), ui(std::make_unique<Ui::ConfigurePerGame>()), - title_id(title_id), system{system_}, addons_tab{std::make_unique<ConfigurePerGameAddons>( - system_, this)}, - audio_tab{std::make_unique<ConfigureAudio>(system_, this)}, - cpu_tab{std::make_unique<ConfigureCpu>(system_, this)}, - general_tab{std::make_unique<ConfigureGeneral>(system_, this)}, - graphics_tab{std::make_unique<ConfigureGraphics>(system_, this)}, - graphics_advanced_tab{std::make_unique<ConfigureGraphicsAdvanced>(system_, this)}, - system_tab{std::make_unique<ConfigureSystem>(system_, this)} { + title_id(title_id), system{system_} { const auto file_path = std::filesystem::path(Common::FS::ToU8String(file_name)); const auto config_file_name = title_id == 0 ? Common::FS::PathToUTF8String(file_path.filename()) : fmt::format("{:016X}", title_id); game_config = std::make_unique<Config>(system, config_file_name, Config::ConfigType::PerGameConfig); + addons_tab = std::make_unique<ConfigurePerGameAddons>(system_, this); + audio_tab = std::make_unique<ConfigureAudio>(system_, this); + cpu_tab = std::make_unique<ConfigureCpu>(system_, this); + general_tab = std::make_unique<ConfigureGeneral>(system_, this); + graphics_tab = std::make_unique<ConfigureGraphics>(system_, this); + graphics_advanced_tab = std::make_unique<ConfigureGraphicsAdvanced>(system_, this); + system_tab = std::make_unique<ConfigureSystem>(system_, this); + ui->setupUi(this); ui->tabWidget->addTab(addons_tab.get(), tr("Add-Ons")); @@ -187,11 +188,4 @@ void ConfigurePerGame::LoadConfiguration() { const auto valueText = ReadableByteSize(file->GetSize()); ui->display_size->setText(valueText); - - general_tab->SetConfiguration(); - cpu_tab->SetConfiguration(); - system_tab->SetConfiguration(); - graphics_tab->SetConfiguration(); - graphics_advanced_tab->SetConfiguration(); - audio_tab->SetConfiguration(); } |