aboutsummaryrefslogtreecommitdiff
path: root/launcher/Application.cpp
diff options
context:
space:
mode:
authorSefa Eyeoglu <contact@scrumplex.net>2022-03-14 23:31:38 +0100
committerGitHub <noreply@github.com>2022-03-14 23:31:38 +0100
commitaedb513c9ee46a50c9208637dc741b322f418cf5 (patch)
treeab0fb9b6c9692c7bbc0ff5defc28376d7f6605c5 /launcher/Application.cpp
parentac3a7acc45bb9375aef0996f2358d6978b863f1e (diff)
parentbb2b344d3300cfc2f13211cd12956e23c98459de (diff)
downloadPrismLauncher-aedb513c9ee46a50c9208637dc741b322f418cf5.tar.gz
PrismLauncher-aedb513c9ee46a50c9208637dc741b322f418cf5.tar.bz2
PrismLauncher-aedb513c9ee46a50c9208637dc741b322f418cf5.zip
Merge pull request #265 from Scrumplex/fix-javacheck-appimage
Define JARs path relative to application root
Diffstat (limited to 'launcher/Application.cpp')
-rw-r--r--launcher/Application.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/launcher/Application.cpp b/launcher/Application.cpp
index 84b5a0fe..e0d7ba0a 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;
@@ -1491,7 +1491,7 @@ QString Application::getJarsPath()
{
return FS::PathCombine(QCoreApplication::applicationDirPath(), "jars");
}
- return m_jarsPath;
+ return FS::PathCombine(m_rootPath, m_jarsPath);
}
QString Application::getMSAClientID()