mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-09-29 15:31:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUI: Fix exception on invalid AudioRenderer

Browse Source 
The findData() on the invalid value correction wasn't working, and was still returning -1.
This was then used in the enable_buffering lambda as the IndexChanged callback, and throwing the Assert.

Have replaced this usage with a lambda to manually find the appropriate entry. Since we localise the text displayed, neither findData nor findText of the combo box did the job.
I haven't touched the is_ranged use of findData.
This commit is contained in:
Bevan Weiss 2020-09-24 20:23:04 +10:00 committed by Megamouse
parent 3b11f22062
commit 92efaf0bba
1 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
rpcs3/rpcs3qt/emu_settings.cpp
View File

@ -221,6 +221,22 @@ void emu_settings::EnhanceComboBox(QComboBox* combobox, emu_settings_type type,
}
}
// Since the QComboBox has localised strings, we can't just findText / findData, so we need to manually iterate through it to find our index
auto find_index = [&](const QString& value)
{
for (int i = 0; i < combobox->count(); i++)
{
const QVariantList var_list = combobox->itemData(i).toList();
ASSERT(var_list.size() == 2 && var_list[0].canConvert<QString>());
if (value == var_list[0].toString())
{
return i;
}
}
return -1;
};
const std::string selected = GetSetting(type);
const QString selected_q = qstr(selected);
int index = -1;
@ -231,30 +247,27 @@ void emu_settings::EnhanceComboBox(QComboBox* combobox, emu_settings_type type,
}
else
{
for (int i = 0; i < combobox->count(); i++)
{
const QVariantList var_list = combobox->itemData(i).toList();
ASSERT(var_list.size() == 2 && var_list[0].canConvert<QString>());
if (selected_q == var_list[0].toString())
{
index = i;
break;
}
}
index = find_index(selected_q);
}
if (index == -1)
{
const std::string def = GetSettingDefault(type);
cfg_log.error("EnhanceComboBox '%s' tried to set an invalid value: %s. Setting to default: %s", cfg_adapter::get_setting_name(type), selected, def);
combobox->setCurrentIndex(combobox->findData(qstr(def)));
if (is_ranged)
{
index = combobox->findData(selected_q);
}
else
{
index = find_index(qstr(def));
}
m_broken_types.insert(type);
}
else
{
combobox->setCurrentIndex(index);
}
combobox->setCurrentIndex(index);
connect(combobox, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged), [=, this](int index)
{