summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2022-01-06 01:14:15 +0100
committerGitHub <noreply@github.com>2022-01-06 01:14:15 +0100
commitf46e1b8ca2f69c0c66f1a961430a834013cd4819 (patch)
treef2cbf614e76459b18712b83d0bdde49c47777caa
parentMerge pull request #7673 from german77/no_return (diff)
parentconfigure_per_game: Initialize tabs after loading custom configuration (diff)
downloadyuzu-f46e1b8ca2f69c0c66f1a961430a834013cd4819.tar
yuzu-f46e1b8ca2f69c0c66f1a961430a834013cd4819.tar.gz
yuzu-f46e1b8ca2f69c0c66f1a961430a834013cd4819.tar.bz2
yuzu-f46e1b8ca2f69c0c66f1a961430a834013cd4819.tar.lz
yuzu-f46e1b8ca2f69c0c66f1a961430a834013cd4819.tar.xz
yuzu-f46e1b8ca2f69c0c66f1a961430a834013cd4819.tar.zst
yuzu-f46e1b8ca2f69c0c66f1a961430a834013cd4819.zip
-rw-r--r--src/yuzu/configuration/configure_per_game.cpp24
1 files changed, 9 insertions, 15 deletions
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();
}