0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make $LAUNCHER_VER actually work

Browse Source
This commit is contained in:
Ryan Cao 2022-06-04 22:59:57 +08:00
parent 5930acc418
commit 4cecba8787
No known key found for this signature in database
GPG Key ID: 528A2C1B6656B97F
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
launcher/Application.cpp
View File

@ -1557,9 +1557,9 @@ QString Application::getCurseKey()
QString Application::getUserAgent() QString Application::getUserAgent()
{ {
QString keyOverride = m_settings->get("UserAgentOverride").toString(); QString uaOverride = m_settings->get("UserAgentOverride").toString();
if (!keyOverride.isEmpty()) { if (!uaOverride.isEmpty()) {
return keyOverride; return uaOverride.replace("$LAUNCHER_VER", BuildConfig.printableVersionString());
} }
return BuildConfig.USER_AGENT; return BuildConfig.USER_AGENT;
@ -1567,9 +1567,9 @@ QString Application::getUserAgent()
QString Application::getUserAgentUncached() QString Application::getUserAgentUncached()
{ {
QString keyOverride = m_settings->get("UserAgentOverride").toString(); QString uaOverride = m_settings->get("UserAgentOverride").toString();
if (!keyOverride.isEmpty()) { if (!uaOverride.isEmpty()) {
return keyOverride; return uaOverride.replace("$LAUNCHER_VER", BuildConfig.printableVersionString());
} }
return BuildConfig.USER_AGENT_UNCACHED; return BuildConfig.USER_AGENT_UNCACHED;

2
launcher/ui/pages/global/APIPage.ui
View File

@ -265,7 +265,7 @@
<item> <item>
<widget class="QLabel" name="userAgentLabel"> <widget class="QLabel" name="userAgentLabel">
<property name="text"> <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> </property>
</widget> </widget>
</item> </item>