From fcc1e80237a4e6e798eb94729cdebfa3e572e8f7 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Sun, 30 Mar 2025 00:46:59 +0200
Subject: [PATCH] fix themes leak

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 5b12d3cfff9092c0364e455c211fc189d87039cd)
---
 launcher/ui/themes/SystemTheme.cpp | 36 ++++++++++++++++--------------
 launcher/ui/themes/SystemTheme.h   |  6 ++---
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/launcher/ui/themes/SystemTheme.cpp b/launcher/ui/themes/SystemTheme.cpp
index 59644ddde..c755b379b 100644
--- a/launcher/ui/themes/SystemTheme.cpp
+++ b/launcher/ui/themes/SystemTheme.cpp
@@ -42,16 +42,18 @@
 
 SystemTheme::SystemTheme(const QString& styleName, bool isDefaultTheme)
 {
-    themeName = isDefaultTheme ? "system" : styleName;
-    widgetTheme = styleName;
-    colorPalette = QStyleFactory::create(styleName)->standardPalette();
+    m_themeName = isDefaultTheme ? "system" : styleName;
+    m_widgetTheme = styleName;
+    auto style = QStyleFactory::create(styleName);
+    m_colorPalette = style->standardPalette();
+    delete style;
 }
 
 void SystemTheme::apply(bool initial)
 {
     // See https://github.com/MultiMC/Launcher/issues/1790
     // or https://github.com/PrismLauncher/PrismLauncher/issues/490
-    if (initial && themeName == "system") {
+    if (initial && m_themeName == "system") {
         QApplication::setStyle(new HintOverrideProxyStyle(QStyleFactory::create(qtTheme())));
         return;
     }
@@ -61,35 +63,35 @@ void SystemTheme::apply(bool initial)
 
 QString SystemTheme::id()
 {
-    return themeName;
+    return m_themeName;
 }
 
 QString SystemTheme::name()
 {
-    if (themeName.toLower() == "windowsvista") {
+    if (m_themeName.toLower() == "windowsvista") {
         return QObject::tr("Windows Vista");
-    } else if (themeName.toLower() == "windows") {
+    } else if (m_themeName.toLower() == "windows") {
         return QObject::tr("Windows 9x");
-    } else if (themeName.toLower() == "windows11") {
+    } else if (m_themeName.toLower() == "windows11") {
         return QObject::tr("Windows 11");
-    } else if (themeName.toLower() == "system") {
+    } else if (m_themeName.toLower() == "system") {
         return QObject::tr("System");
     } else {
-        return themeName;
+        return m_themeName;
     }
 }
 
 QString SystemTheme::tooltip()
 {
-    if (themeName.toLower() == "windowsvista") {
+    if (m_themeName.toLower() == "windowsvista") {
         return QObject::tr("Widget style trying to look like your win32 theme");
-    } else if (themeName.toLower() == "windows") {
+    } else if (m_themeName.toLower() == "windows") {
         return QObject::tr("Windows 9x inspired widget style");
-    } else if (themeName.toLower() == "windows11") {
+    } else if (m_themeName.toLower() == "windows11") {
         return QObject::tr("WinUI 3 inspired Qt widget style");
-    } else if (themeName.toLower() == "fusion") {
+    } else if (m_themeName.toLower() == "fusion") {
         return QObject::tr("The default Qt widget style");
-    } else if (themeName.toLower() == "system") {
+    } else if (m_themeName.toLower() == "system") {
         return QObject::tr("Your current system theme");
     } else {
         return "";
@@ -98,12 +100,12 @@ QString SystemTheme::tooltip()
 
 QString SystemTheme::qtTheme()
 {
-    return widgetTheme;
+    return m_widgetTheme;
 }
 
 QPalette SystemTheme::colorScheme()
 {
-    return colorPalette;
+    return m_colorPalette;
 }
 
 QString SystemTheme::appStyleSheet()
diff --git a/launcher/ui/themes/SystemTheme.h b/launcher/ui/themes/SystemTheme.h
index 09db1a322..54404d052 100644
--- a/launcher/ui/themes/SystemTheme.h
+++ b/launcher/ui/themes/SystemTheme.h
@@ -53,7 +53,7 @@ class SystemTheme : public ITheme {
     QColor fadeColor() override;
 
    private:
-    QPalette colorPalette;
-    QString widgetTheme;
-    QString themeName;
+    QPalette m_colorPalette;
+    QString m_widgetTheme;
+    QString m_themeName;
 };