From 4cecba8787d3c4e9e8d1a0234a1850747b501a2e Mon Sep 17 00:00:00 2001
From: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
Date: Sat, 4 Jun 2022 22:59:57 +0800
Subject: [PATCH] make $LAUNCHER_VER actually work

---
 launcher/Application.cpp            | 12 ++++++------
 launcher/ui/pages/global/APIPage.ui |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/launcher/Application.cpp b/launcher/Application.cpp
index dd6f8ec65..7143b7670 100644
--- a/launcher/Application.cpp
+++ b/launcher/Application.cpp
@@ -1557,9 +1557,9 @@ QString Application::getCurseKey()
 
 QString Application::getUserAgent()
 {
-    QString keyOverride = m_settings->get("UserAgentOverride").toString();
-    if (!keyOverride.isEmpty()) {
-        return keyOverride;
+    QString uaOverride = m_settings->get("UserAgentOverride").toString();
+    if (!uaOverride.isEmpty()) {
+        return uaOverride.replace("$LAUNCHER_VER", BuildConfig.printableVersionString());
     }
 
     return BuildConfig.USER_AGENT;
@@ -1567,9 +1567,9 @@ QString Application::getUserAgent()
 
 QString Application::getUserAgentUncached()
 {
-    QString keyOverride = m_settings->get("UserAgentOverride").toString();
-    if (!keyOverride.isEmpty()) {
-        return keyOverride;
+    QString uaOverride = m_settings->get("UserAgentOverride").toString();
+    if (!uaOverride.isEmpty()) {
+        return uaOverride.replace("$LAUNCHER_VER", BuildConfig.printableVersionString());
     }
 
     return BuildConfig.USER_AGENT_UNCACHED;
diff --git a/launcher/ui/pages/global/APIPage.ui b/launcher/ui/pages/global/APIPage.ui
index eb8825b9a..9524424eb 100644
--- a/launcher/ui/pages/global/APIPage.ui
+++ b/launcher/ui/pages/global/APIPage.ui
@@ -265,7 +265,7 @@
               <item>
                <widget class="QLabel" name="userAgentLabel">
                 <property name="text">
-                 <string>Enter a custom User Agent here. The special string ${launcher_version} will be replaced with the version of the launcher.</string>
+                 <string>Enter a custom User Agent here. The special string $LAUNCHER_VER will be replaced with the version of the launcher.</string>
                 </property>
                </widget>
               </item>