From d16c6b0e691061f404eb5bab2004504918db4de3 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Mon, 14 Mar 2022 23:31:38 +0100
Subject: Merge pull request #265 from Scrumplex/fix-javacheck-appimage

Define JARs path relative to application root
---
 launcher/Application.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'launcher')

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() 
-- 
cgit