From deb27d5b557441c649763a267ca26e556e47bff1 Mon Sep 17 00:00:00 2001
From: Jonas Kvinge <jonas@jkvinge.net>
Date: Sun, 8 Nov 2020 14:24:09 +0100
Subject: [PATCH] Replace '&' with '&amp;' in D-BUS OSD messages

---
 src/osd/osddbus.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/osd/osddbus.cpp b/src/osd/osddbus.cpp
index d9f9baee3..66d758d4e 100644
--- a/src/osd/osddbus.cpp
+++ b/src/osd/osddbus.cpp
@@ -143,8 +143,8 @@ void OSDDBus::ShowMessageNative(const QString &summary, const QString &message,
   QVariantMap hints;
   QString summary_stripped = summary;
   QString message_stripped = message;
-  summary_stripped = summary_stripped.remove('&').simplified();
-  message_stripped = message_stripped.remove('&').simplified();
+  summary_stripped = summary_stripped.replace('&', "&amp;").simplified();
+  message_stripped = message_stripped.replace('&', "&amp;").simplified();
 
   if (!image.isNull()) {
     if (version_ >= QVersionNumber(1, 2)) {