summaryrefslogtreecommitdiffstats
path: root/src/citra_qt/configuration/configure_general.cpp
diff options
context:
space:
mode:
authorMerryMage <MerryMage@users.noreply.github.com>2018-01-12 17:06:30 +0100
committerbunnei <bunneidev@gmail.com>2018-01-12 23:48:52 +0100
commitb628192bf27c871af3ecbf8982b4a13a78fd70c4 (patch)
treea5d66996675378584d2324c48c8e3ef4c8f33a74 /src/citra_qt/configuration/configure_general.cpp
parentarm_dynarmic: Implement core (diff)
downloadyuzu-b628192bf27c871af3ecbf8982b4a13a78fd70c4.tar
yuzu-b628192bf27c871af3ecbf8982b4a13a78fd70c4.tar.gz
yuzu-b628192bf27c871af3ecbf8982b4a13a78fd70c4.tar.bz2
yuzu-b628192bf27c871af3ecbf8982b4a13a78fd70c4.tar.lz
yuzu-b628192bf27c871af3ecbf8982b4a13a78fd70c4.tar.xz
yuzu-b628192bf27c871af3ecbf8982b4a13a78fd70c4.tar.zst
yuzu-b628192bf27c871af3ecbf8982b4a13a78fd70c4.zip
Diffstat (limited to 'src/citra_qt/configuration/configure_general.cpp')
-rw-r--r--src/citra_qt/configuration/configure_general.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/citra_qt/configuration/configure_general.cpp b/src/citra_qt/configuration/configure_general.cpp
index 939379717..0de27aa8b 100644
--- a/src/citra_qt/configuration/configure_general.cpp
+++ b/src/citra_qt/configuration/configure_general.cpp
@@ -19,7 +19,7 @@ ConfigureGeneral::ConfigureGeneral(QWidget* parent)
this->setConfiguration();
- ui->toggle_cpu_jit->setEnabled(!Core::System::GetInstance().IsPoweredOn());
+ ui->cpu_core_combobox->setEnabled(!Core::System::GetInstance().IsPoweredOn());
}
ConfigureGeneral::~ConfigureGeneral() {}
@@ -27,12 +27,12 @@ ConfigureGeneral::~ConfigureGeneral() {}
void ConfigureGeneral::setConfiguration() {
ui->toggle_deepscan->setChecked(UISettings::values.gamedir_deepscan);
ui->toggle_check_exit->setChecked(UISettings::values.confirm_before_closing);
- ui->toggle_cpu_jit->setChecked(Settings::values.use_cpu_jit);
// The first item is "auto-select" with actual value -1, so plus one here will do the trick
ui->region_combobox->setCurrentIndex(Settings::values.region_value + 1);
ui->theme_combobox->setCurrentIndex(ui->theme_combobox->findData(UISettings::values.theme));
+ ui->cpu_core_combobox->setCurrentIndex(static_cast<int>(Settings::values.cpu_core));
}
void ConfigureGeneral::applyConfiguration() {
@@ -41,6 +41,7 @@ void ConfigureGeneral::applyConfiguration() {
UISettings::values.theme =
ui->theme_combobox->itemData(ui->theme_combobox->currentIndex()).toString();
Settings::values.region_value = ui->region_combobox->currentIndex() - 1;
- Settings::values.use_cpu_jit = ui->toggle_cpu_jit->isChecked();
+ Settings::values.cpu_core =
+ static_cast<Settings::CpuCore>(ui->cpu_core_combobox->currentIndex());
Settings::Apply();
}