diff options
| -rw-r--r-- | src/core/settings.h | 1 | ||||
| -rw-r--r-- | src/yuzu/configuration/config.cpp | 4 | ||||
| -rw-r--r-- | src/yuzu/configuration/configure_system.cpp | 2 |
3 files changed, 7 insertions, 0 deletions
diff --git a/src/core/settings.h b/src/core/settings.h index cb5979e6f..12e2cc9e7 100644 --- a/src/core/settings.h +++ b/src/core/settings.h | |||
| @@ -387,6 +387,7 @@ struct Values { | |||
| 387 | 387 | ||
| 388 | s32 current_user; | 388 | s32 current_user; |
| 389 | s32 language_index; | 389 | s32 language_index; |
| 390 | s32 sound_index; | ||
| 390 | 391 | ||
| 391 | // Controls | 392 | // Controls |
| 392 | std::array<PlayerInput, 10> players; | 393 | std::array<PlayerInput, 10> players; |
diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp index c38860628..e26af33b3 100644 --- a/src/yuzu/configuration/config.cpp +++ b/src/yuzu/configuration/config.cpp | |||
| @@ -698,6 +698,8 @@ void Config::ReadSystemValues() { | |||
| 698 | Settings::values.custom_rtc = std::nullopt; | 698 | Settings::values.custom_rtc = std::nullopt; |
| 699 | } | 699 | } |
| 700 | 700 | ||
| 701 | Settings::values.sound_index = ReadSetting(QStringLiteral("sound_index"), 1).toInt(); | ||
| 702 | |||
| 701 | qt_config->endGroup(); | 703 | qt_config->endGroup(); |
| 702 | } | 704 | } |
| 703 | 705 | ||
| @@ -1125,6 +1127,8 @@ void Config::SaveSystemValues() { | |||
| 1125 | Settings::values.custom_rtc.value_or(std::chrono::seconds{}).count()), | 1127 | Settings::values.custom_rtc.value_or(std::chrono::seconds{}).count()), |
| 1126 | 0); | 1128 | 0); |
| 1127 | 1129 | ||
| 1130 | WriteSetting(QStringLiteral("sound_index"), Settings::values.sound_index, 1); | ||
| 1131 | |||
| 1128 | qt_config->endGroup(); | 1132 | qt_config->endGroup(); |
| 1129 | } | 1133 | } |
| 1130 | 1134 | ||
diff --git a/src/yuzu/configuration/configure_system.cpp b/src/yuzu/configuration/configure_system.cpp index e1b52f8d9..f9a5b4fbe 100644 --- a/src/yuzu/configuration/configure_system.cpp +++ b/src/yuzu/configuration/configure_system.cpp | |||
| @@ -56,6 +56,7 @@ void ConfigureSystem::SetConfiguration() { | |||
| 56 | enabled = !Core::System::GetInstance().IsPoweredOn(); | 56 | enabled = !Core::System::GetInstance().IsPoweredOn(); |
| 57 | 57 | ||
| 58 | ui->combo_language->setCurrentIndex(Settings::values.language_index); | 58 | ui->combo_language->setCurrentIndex(Settings::values.language_index); |
| 59 | ui->combo_sound->setCurrentIndex(Settings::values.sound_index); | ||
| 59 | 60 | ||
| 60 | ui->rng_seed_checkbox->setChecked(Settings::values.rng_seed.has_value()); | 61 | ui->rng_seed_checkbox->setChecked(Settings::values.rng_seed.has_value()); |
| 61 | ui->rng_seed_edit->setEnabled(Settings::values.rng_seed.has_value()); | 62 | ui->rng_seed_edit->setEnabled(Settings::values.rng_seed.has_value()); |
| @@ -81,6 +82,7 @@ void ConfigureSystem::ApplyConfiguration() { | |||
| 81 | } | 82 | } |
| 82 | 83 | ||
| 83 | Settings::values.language_index = ui->combo_language->currentIndex(); | 84 | Settings::values.language_index = ui->combo_language->currentIndex(); |
| 85 | Settings::values.sound_index = ui->combo_sound->currentIndex(); | ||
| 84 | 86 | ||
| 85 | if (ui->rng_seed_checkbox->isChecked()) { | 87 | if (ui->rng_seed_checkbox->isChecked()) { |
| 86 | Settings::values.rng_seed = ui->rng_seed_edit->text().toULongLong(nullptr, 16); | 88 | Settings::values.rng_seed = ui->rng_seed_edit->text().toULongLong(nullptr, 16); |