diff options
| author | 2018-09-10 16:30:45 -0600 | |
|---|---|---|
| committer | 2018-09-10 16:30:45 -0600 | |
| commit | 4bea6657ef0cabbb769fb260cd96911236939d6a (patch) | |
| tree | 64ed4f910038dd824c8fd2d26742bdcbe1e37d94 /src | |
| parent | Merge pull request #1264 from degasus/optimizations (diff) | |
| parent | Remove multicore configure_general.ui (diff) | |
| download | yuzu-4bea6657ef0cabbb769fb260cd96911236939d6a.tar.gz yuzu-4bea6657ef0cabbb769fb260cd96911236939d6a.tar.xz yuzu-4bea6657ef0cabbb769fb260cd96911236939d6a.zip | |
Merge pull request #1288 from MysticExile/remove-multicore
Remove the multi-core option from the UI
Diffstat (limited to 'src')
| -rw-r--r-- | src/yuzu/configuration/configure_general.cpp | 3 | ||||
| -rw-r--r-- | src/yuzu/configuration/configure_general.ui | 7 |
2 files changed, 0 insertions, 10 deletions
diff --git a/src/yuzu/configuration/configure_general.cpp b/src/yuzu/configuration/configure_general.cpp index d8caee1e8..9292d9a42 100644 --- a/src/yuzu/configuration/configure_general.cpp +++ b/src/yuzu/configuration/configure_general.cpp | |||
| @@ -20,7 +20,6 @@ ConfigureGeneral::ConfigureGeneral(QWidget* parent) | |||
| 20 | this->setConfiguration(); | 20 | this->setConfiguration(); |
| 21 | 21 | ||
| 22 | ui->use_cpu_jit->setEnabled(!Core::System::GetInstance().IsPoweredOn()); | 22 | ui->use_cpu_jit->setEnabled(!Core::System::GetInstance().IsPoweredOn()); |
| 23 | ui->use_multi_core->setEnabled(!Core::System::GetInstance().IsPoweredOn()); | ||
| 24 | ui->use_docked_mode->setEnabled(!Core::System::GetInstance().IsPoweredOn()); | 23 | ui->use_docked_mode->setEnabled(!Core::System::GetInstance().IsPoweredOn()); |
| 25 | } | 24 | } |
| 26 | 25 | ||
| @@ -31,7 +30,6 @@ void ConfigureGeneral::setConfiguration() { | |||
| 31 | ui->toggle_check_exit->setChecked(UISettings::values.confirm_before_closing); | 30 | ui->toggle_check_exit->setChecked(UISettings::values.confirm_before_closing); |
| 32 | ui->theme_combobox->setCurrentIndex(ui->theme_combobox->findData(UISettings::values.theme)); | 31 | ui->theme_combobox->setCurrentIndex(ui->theme_combobox->findData(UISettings::values.theme)); |
| 33 | ui->use_cpu_jit->setChecked(Settings::values.use_cpu_jit); | 32 | ui->use_cpu_jit->setChecked(Settings::values.use_cpu_jit); |
| 34 | ui->use_multi_core->setChecked(Settings::values.use_multi_core); | ||
| 35 | ui->use_docked_mode->setChecked(Settings::values.use_docked_mode); | 33 | ui->use_docked_mode->setChecked(Settings::values.use_docked_mode); |
| 36 | } | 34 | } |
| 37 | 35 | ||
| @@ -46,6 +44,5 @@ void ConfigureGeneral::applyConfiguration() { | |||
| 46 | ui->theme_combobox->itemData(ui->theme_combobox->currentIndex()).toString(); | 44 | ui->theme_combobox->itemData(ui->theme_combobox->currentIndex()).toString(); |
| 47 | 45 | ||
| 48 | Settings::values.use_cpu_jit = ui->use_cpu_jit->isChecked(); | 46 | Settings::values.use_cpu_jit = ui->use_cpu_jit->isChecked(); |
| 49 | Settings::values.use_multi_core = ui->use_multi_core->isChecked(); | ||
| 50 | Settings::values.use_docked_mode = ui->use_docked_mode->isChecked(); | 47 | Settings::values.use_docked_mode = ui->use_docked_mode->isChecked(); |
| 51 | } | 48 | } |
diff --git a/src/yuzu/configuration/configure_general.ui b/src/yuzu/configuration/configure_general.ui index 233adbe27..1775c4d40 100644 --- a/src/yuzu/configuration/configure_general.ui +++ b/src/yuzu/configuration/configure_general.ui | |||
| @@ -58,13 +58,6 @@ | |||
| 58 | </property> | 58 | </property> |
| 59 | </widget> | 59 | </widget> |
| 60 | </item> | 60 | </item> |
| 61 | <item> | ||
| 62 | <widget class="QCheckBox" name="use_multi_core"> | ||
| 63 | <property name="text"> | ||
| 64 | <string>Enable multi-core</string> | ||
| 65 | </property> | ||
| 66 | </widget> | ||
| 67 | </item> | ||
| 68 | </layout> | 61 | </layout> |
| 69 | </item> | 62 | </item> |
| 70 | </layout> | 63 | </layout> |