fix: define jars path relative to application root

Fixes #117
2022-03-13 11:44:30 +01:00
parent b96572774f
commit bb2b344d33
2 changed files with 5 additions and 4 deletions
--- 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()