diff options
| author | Charles Lombardo <clombardo169@gmail.com> | 2023-11-24 22:59:55 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-24 22:59:55 -0500 |
| commit | 5a182f4e7ccfac696cd54542089c880d002f5cc9 (patch) | |
| tree | e1bcd72f38f4f57ff6b915022268b0feb86a7937 /src/yuzu/configuration/configure_ui.cpp | |
| parent | 093eb075a686d3584f59b129a200c2652a5cdb10 (diff) | |
| parent | dda187d300de379abc4f4e17b5fd73a4eed8d956 (diff) | |
Merge pull request #11889 from t895/ini-lib
configuration: Unify config handling across frontends
Diffstat (limited to 'src/yuzu/configuration/configure_ui.cpp')
| -rw-r--r-- | src/yuzu/configuration/configure_ui.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/yuzu/configuration/configure_ui.cpp b/src/yuzu/configuration/configure_ui.cpp index 82f3b6e78..dd43f0a0e 100644 --- a/src/yuzu/configuration/configure_ui.cpp +++ b/src/yuzu/configuration/configure_ui.cpp @@ -164,7 +164,7 @@ ConfigureUi::~ConfigureUi() = default; void ConfigureUi::ApplyConfiguration() { UISettings::values.theme = - ui->theme_combobox->itemData(ui->theme_combobox->currentIndex()).toString(); + ui->theme_combobox->itemData(ui->theme_combobox->currentIndex()).toString().toStdString(); UISettings::values.show_add_ons = ui->show_add_ons->isChecked(); UISettings::values.show_compat = ui->show_compat->isChecked(); UISettings::values.show_size = ui->show_size->isChecked(); @@ -191,9 +191,10 @@ void ConfigureUi::RequestGameListUpdate() { } void ConfigureUi::SetConfiguration() { - ui->theme_combobox->setCurrentIndex(ui->theme_combobox->findData(UISettings::values.theme)); + ui->theme_combobox->setCurrentIndex( + ui->theme_combobox->findData(QString::fromStdString(UISettings::values.theme))); ui->language_combobox->setCurrentIndex( - ui->language_combobox->findData(UISettings::values.language)); + ui->language_combobox->findData(QString::fromStdString(UISettings::values.language))); ui->show_add_ons->setChecked(UISettings::values.show_add_ons.GetValue()); ui->show_compat->setChecked(UISettings::values.show_compat.GetValue()); ui->show_size->setChecked(UISettings::values.show_size.GetValue()); |