mirror of
https://github.com/yuzu-emu/yuzu-android.git
synced 2024-11-30 02:04:18 +01:00
yuzu: Fix language comobox crash
This commit is contained in:
parent
380dcde154
commit
a436467152
@ -92,3 +92,13 @@ void ConfigurationShared::InsertGlobalItem(QComboBox* combobox, int global_index
|
|||||||
combobox->insertItem(ConfigurationShared::USE_GLOBAL_INDEX, use_global_text);
|
combobox->insertItem(ConfigurationShared::USE_GLOBAL_INDEX, use_global_text);
|
||||||
combobox->insertSeparator(ConfigurationShared::USE_GLOBAL_SEPARATOR_INDEX);
|
combobox->insertSeparator(ConfigurationShared::USE_GLOBAL_SEPARATOR_INDEX);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int ConfigurationShared::GetComboboxIndex(int global_setting_index, const QComboBox* combobox) {
|
||||||
|
if (Settings::IsConfiguringGlobal()) {
|
||||||
|
return combobox->currentIndex();
|
||||||
|
}
|
||||||
|
if (combobox->currentIndex() == ConfigurationShared::USE_GLOBAL_INDEX) {
|
||||||
|
return global_setting_index;
|
||||||
|
}
|
||||||
|
return combobox->currentIndex() - ConfigurationShared::USE_GLOBAL_OFFSET;
|
||||||
|
}
|
||||||
|
@ -69,4 +69,7 @@ void SetColoredComboBox(QComboBox* combobox, QWidget* target, int global);
|
|||||||
// Adds the "Use Global Configuration" selection and separator to the beginning of a QComboBox
|
// Adds the "Use Global Configuration" selection and separator to the beginning of a QComboBox
|
||||||
void InsertGlobalItem(QComboBox* combobox, int global_index);
|
void InsertGlobalItem(QComboBox* combobox, int global_index);
|
||||||
|
|
||||||
|
// Returns the correct index of a QComboBox taking into account global configuration
|
||||||
|
int GetComboboxIndex(int global_setting_index, const QComboBox* combobox);
|
||||||
|
|
||||||
} // namespace ConfigurationShared
|
} // namespace ConfigurationShared
|
||||||
|
@ -31,6 +31,9 @@ constexpr std::array<u32, 7> LOCALE_BLOCKLIST{
|
|||||||
};
|
};
|
||||||
|
|
||||||
static bool IsValidLocale(u32 region_index, u32 language_index) {
|
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;
|
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 auto locale_check = [this](int index) {
|
||||||
const bool valid_locale =
|
const auto region_index = ConfigurationShared::GetComboboxIndex(
|
||||||
IsValidLocale(ui->combo_region->currentIndex(), ui->combo_language->currentIndex());
|
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);
|
ui->label_warn_invalid_locale->setVisible(!valid_locale);
|
||||||
if (!valid_locale) {
|
if (!valid_locale) {
|
||||||
ui->label_warn_invalid_locale->setText(
|
ui->label_warn_invalid_locale->setText(
|
||||||
|
@ -42,13 +42,7 @@ private:
|
|||||||
std::unique_ptr<Ui::ConfigureSystem> ui;
|
std::unique_ptr<Ui::ConfigureSystem> ui;
|
||||||
bool enabled = false;
|
bool enabled = false;
|
||||||
|
|
||||||
int language_index = 0;
|
|
||||||
int region_index = 0;
|
|
||||||
int time_zone_index = 0;
|
|
||||||
int sound_index = 0;
|
|
||||||
|
|
||||||
ConfigurationShared::CheckState use_rng_seed;
|
ConfigurationShared::CheckState use_rng_seed;
|
||||||
ConfigurationShared::CheckState use_custom_rtc;
|
|
||||||
|
|
||||||
Core::System& system;
|
Core::System& system;
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user