aboutsummaryrefslogtreecommitdiff
path: root/launcher
diff options
context:
space:
mode:
authorSefa Eyeoglu <contact@scrumplex.net>2022-03-14 23:31:38 +0100
committerSefa Eyeoglu <contact@scrumplex.net>2022-03-22 20:11:15 +0100
commitd16c6b0e691061f404eb5bab2004504918db4de3 (patch)
treee03884bee892e75e070ba8bad9fe5bef75f947b2 /launcher
parent76e1aba58b71fff9293f2cff6ba581629f6f54bc (diff)
downloadPrismLauncher-d16c6b0e691061f404eb5bab2004504918db4de3.tar.gz
PrismLauncher-d16c6b0e691061f404eb5bab2004504918db4de3.tar.bz2
PrismLauncher-d16c6b0e691061f404eb5bab2004504918db4de3.zip
Merge pull request #265 from Scrumplex/fix-javacheck-appimage
Define JARs path relative to application root
Diffstat (limited to 'launcher')
-rw-r--r--launcher/Application.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/launcher/Application.cpp b/launcher/Application.cpp
index 0ce80d4b..c699d840 100644
--- a/launcher/Application.cpp
+++ b/launcher/Application.cpp
@@ -515,8 +515,8 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
FS::updateTimestamp(m_rootPath);
#endif
-#ifdef MULTIMC_JARS_LOCATION
- m_jarsPath = TOSTRING(MULTIMC_JARS_LOCATION);
+#ifdef LAUNCHER_JARS_LOCATION
+ m_jarsPath = TOSTRING(LAUNCHER_JARS_LOCATION);
#endif
qDebug() << BuildConfig.LAUNCHER_DISPLAYNAME << ", (c) 2013-2021 " << BuildConfig.LAUNCHER_COPYRIGHT;
@@ -1494,7 +1494,7 @@ QString Application::getJarsPath()
{
return FS::PathCombine(QCoreApplication::applicationDirPath(), "jars");
}
- return m_jarsPath;
+ return FS::PathCombine(m_rootPath, m_jarsPath);
}
QString Application::getMSAClientID()