summaryrefslogtreecommitdiff
path: root/src/citra_qt/configuration/configure_general.cpp
diff options
context:
space:
mode:
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)
19 19
20 this->setConfiguration(); 20 this->setConfiguration();
21 21
22 ui->toggle_cpu_jit->setEnabled(!Core::System::GetInstance().IsPoweredOn()); 22 ui->cpu_core_combobox->setEnabled(!Core::System::GetInstance().IsPoweredOn());
23} 23}
24 24
25ConfigureGeneral::~ConfigureGeneral() {} 25ConfigureGeneral::~ConfigureGeneral() {}
@@ -27,12 +27,12 @@ ConfigureGeneral::~ConfigureGeneral() {}
27void ConfigureGeneral::setConfiguration() { 27void ConfigureGeneral::setConfiguration() {
28 ui->toggle_deepscan->setChecked(UISettings::values.gamedir_deepscan); 28 ui->toggle_deepscan->setChecked(UISettings::values.gamedir_deepscan);
29 ui->toggle_check_exit->setChecked(UISettings::values.confirm_before_closing); 29 ui->toggle_check_exit->setChecked(UISettings::values.confirm_before_closing);
30 ui->toggle_cpu_jit->setChecked(Settings::values.use_cpu_jit);
31 30
32 // The first item is "auto-select" with actual value -1, so plus one here will do the trick 31 // The first item is "auto-select" with actual value -1, so plus one here will do the trick
33 ui->region_combobox->setCurrentIndex(Settings::values.region_value + 1); 32 ui->region_combobox->setCurrentIndex(Settings::values.region_value + 1);
34 33
35 ui->theme_combobox->setCurrentIndex(ui->theme_combobox->findData(UISettings::values.theme)); 34 ui->theme_combobox->setCurrentIndex(ui->theme_combobox->findData(UISettings::values.theme));
35 ui->cpu_core_combobox->setCurrentIndex(static_cast<int>(Settings::values.cpu_core));
36} 36}
37 37
38void ConfigureGeneral::applyConfiguration() { 38void ConfigureGeneral::applyConfiguration() {
@@ -41,6 +41,7 @@ void ConfigureGeneral::applyConfiguration() {
41 UISettings::values.theme = 41 UISettings::values.theme =
42 ui->theme_combobox->itemData(ui->theme_combobox->currentIndex()).toString(); 42 ui->theme_combobox->itemData(ui->theme_combobox->currentIndex()).toString();
43 Settings::values.region_value = ui->region_combobox->currentIndex() - 1; 43 Settings::values.region_value = ui->region_combobox->currentIndex() - 1;
44 Settings::values.use_cpu_jit = ui->toggle_cpu_jit->isChecked(); 44 Settings::values.cpu_core =
45 static_cast<Settings::CpuCore>(ui->cpu_core_combobox->currentIndex());
45 Settings::Apply(); 46 Settings::Apply();
46} 47}