From ff0bf64050e836f717b32df0bb0077d60e8b6ee5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Thu, 29 May 2025 09:54:25 +0200 Subject: [PATCH] Remove left-behind ampersand merging from atlas text-drawing codepath See #20402 --- Common/Render/DrawBuffer.cpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Common/Render/DrawBuffer.cpp b/Common/Render/DrawBuffer.cpp index 7b6345ba29..1cd095d9ea 100644 --- a/Common/Render/DrawBuffer.cpp +++ b/Common/Render/DrawBuffer.cpp @@ -518,9 +518,6 @@ void DrawBuffer::MeasureText(FontID font, std::string_view text, float *w, float continue; } else if (cval == '\t') { cval = ' '; - } else if (cval == '&' && utf.peek() != '&') { - // Ignore lone ampersands - continue; } const AtlasChar *c = atlasfont->getChar(cval); if (c) { @@ -659,9 +656,6 @@ void DrawBuffer::DrawText(FontID font, std::string_view text, float x, float y, continue; } else if (cval == '\t') { cval = ' '; - } else if (cval == '&' && utf.peek() != '&') { - // Ignore lone ampersands - continue; } const AtlasChar *ch = atlasfont->getChar(cval); if (!ch)