From 875c6bbada930c3877aad6a0385746c9b9d58e8b Mon Sep 17 00:00:00 2001
From: SabrePenguin <lknofczynski@gmail.com>
Date: Tue, 30 Apr 2024 23:28:50 -0400
Subject: [PATCH] Switched </ul> to a Regex expression

Signed-off-by: SabrePenguin <lknofczynski@gmail.com>
---
 launcher/StringUtils.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/launcher/StringUtils.cpp b/launcher/StringUtils.cpp
index db53f353e..125b8ca6f 100644
--- a/launcher/StringUtils.cpp
+++ b/launcher/StringUtils.cpp
@@ -215,11 +215,13 @@ QPair<QString, QString> StringUtils::splitFirst(const QString& s, const QRegular
 
 QString StringUtils::htmlListPatch(QString htmlStr)
 {
-    int pos = htmlStr.indexOf("</ul>");
-    int imgPos;
+    QRegularExpression match("<w*/w*ulw*>|<w*ulw*/w*>");
+    int pos = htmlStr.indexOf(match);
+    int imgPos, dist;
     while (pos != -1) {
-        pos = pos + 5;  // 5 is the size of the </ul> tag
-        imgPos = htmlStr.indexOf("<img", pos);
+        dist = htmlStr.indexOf(">", pos) - pos + 1; // Get the size of the </ul> tag. Add one for zeroeth index
+        pos = pos + dist;
+        imgPos = htmlStr.indexOf("<img ", pos);
         if (imgPos == -1)
             break;  // no image after the tag
 
@@ -228,7 +230,7 @@ QString StringUtils::htmlListPatch(QString htmlStr)
         if (textBetween.isEmpty())
             htmlStr.insert(pos, "<br>");
 
-        pos = htmlStr.indexOf("</ul>", pos);
+        pos = htmlStr.indexOf(match, pos);
     }
     return htmlStr;
 }
\ No newline at end of file