1
0
mirror of https://github.com/libretro/RetroArch synced 2025-02-24 18:39:59 +00:00

Merge pull request from CozmoP/ampersand

Qt: sanitize ampersands
This commit is contained in:
Twinaphex 2019-04-16 03:17:09 +02:00 committed by GitHub
commit 2fcb4b5854
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -55,9 +55,14 @@ inline void addSublabelAndWhatsThis(QWidget *widget, rarch_setting_t *setting)
widget->setWhatsThis(tmp);
}
static QString sanitizeAmpersand(QString input)
{
return input.replace("&", "&&");
}
inline QString formLabel(rarch_setting_t *setting)
{
return QString(setting->short_description) + ":";
return QString(sanitizeAmpersand(setting->short_description)) + ":";
}
FormLayout::FormLayout(QWidget *parent) :
@ -271,7 +276,7 @@ void SettingsGroup::addBindButton(rarch_setting_t *setting)
}
CheckBox::CheckBox(rarch_setting_t *setting, QWidget *parent) :
QCheckBox(setting->short_description, parent)
QCheckBox(sanitizeAmpersand(setting->short_description), parent)
,m_setting(setting)
,m_value(setting->value.target.boolean)
{