INSANEMODE/yuzu-android
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu-android.git synced 2025-06-14 07:47:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

yuzu: Fix language comobox crash

Browse Source
This commit is contained in:
german77
2023-01-22 01:35:28 -06:00
parent 380dcde154
commit a436467152
4 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/yuzu/configuration/configure_system.cpp
View File

@ -31,6 +31,9 @@ constexpr std::array<u32, 7> LOCALE_BLOCKLIST{
};
static bool IsValidLocale(u32 region_index, u32 language_index) {
if (region_index >= LOCALE_BLOCKLIST.size()) {
return false;
}
return ((LOCALE_BLOCKLIST.at(region_index) >> language_index) & 1) == 0;
}
@ -55,8 +58,11 @@ ConfigureSystem::ConfigureSystem(Core::System& system_, QWidget* parent)
});
const auto locale_check = [this](int index) {
const bool valid_locale =
IsValidLocale(ui->combo_region->currentIndex(), ui->combo_language->currentIndex());
const auto region_index = ConfigurationShared::GetComboboxIndex(
Settings::values.region_index.GetValue(true), ui->combo_region);
const auto language_index = ConfigurationShared::GetComboboxIndex(
Settings::values.language_index.GetValue(true), ui->combo_language);
const bool valid_locale = IsValidLocale(region_index, language_index);
ui->label_warn_invalid_locale->setVisible(!valid_locale);
if (!valid_locale) {
ui->label_warn_invalid_locale->setText(