From aa98a80fa68b4da1f84cc608848dfa67367efd12 Mon Sep 17 00:00:00 2001
From: CozmoP <25121396+CozmoP@users.noreply.github.com>
Date: Mon, 15 Apr 2019 22:45:03 +0200
Subject: [PATCH] Qt: sanitize ampersands

---
 ui/drivers/qt/settingswidgets.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/ui/drivers/qt/settingswidgets.cpp b/ui/drivers/qt/settingswidgets.cpp
index 40b0b1e3ec..ace540f703 100644
--- a/ui/drivers/qt/settingswidgets.cpp
+++ b/ui/drivers/qt/settingswidgets.cpp
@@ -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)
 {