diff options
| author | seth <getchoo@tuta.io> | 2022-10-21 21:29:28 -0400 |
|---|---|---|
| committer | seth <getchoo@tuta.io> | 2022-10-21 21:40:21 -0400 |
| commit | 4a2b25e841224441c0dcaa81bcbd0f716d64201e (patch) | |
| tree | 43840ba2e4bb01d39e65eaf3ef5acf0783fc8156 | |
| parent | ba4af1a890f3d2990d86a36a2fbbb16ad2c774cf (diff) | |
| download | PrismLauncher-4a2b25e841224441c0dcaa81bcbd0f716d64201e.tar.gz PrismLauncher-4a2b25e841224441c0dcaa81bcbd0f716d64201e.tar.bz2 PrismLauncher-4a2b25e841224441c0dcaa81bcbd0f716d64201e.zip | |
fix: use correct variable for jars path
Signed-off-by: seth <getchoo@tuta.io>
| -rw-r--r-- | buildconfig/BuildConfig.cpp.in | 1 | ||||
| -rw-r--r-- | buildconfig/BuildConfig.h | 1 | ||||
| -rw-r--r-- | launcher/Application.cpp | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/buildconfig/BuildConfig.cpp.in b/buildconfig/BuildConfig.cpp.in index 50e5e8a4..fc68326c 100644 --- a/buildconfig/BuildConfig.cpp.in +++ b/buildconfig/BuildConfig.cpp.in @@ -42,6 +42,7 @@ Config::Config() { // Name and copyright LAUNCHER_NAME = "@Launcher_Name@"; + LAUNCHER_APP_BINARY_NAME = "@Launcher_APP_BINARY_NAME@"' LAUNCHER_DISPLAYNAME = "@Launcher_DisplayName@"; LAUNCHER_COPYRIGHT = "@Launcher_Copyright@"; LAUNCHER_DOMAIN = "@Launcher_Domain@"; diff --git a/buildconfig/BuildConfig.h b/buildconfig/BuildConfig.h index ef384ed2..13ccdaa1 100644 --- a/buildconfig/BuildConfig.h +++ b/buildconfig/BuildConfig.h @@ -44,6 +44,7 @@ class Config { public: Config(); QString LAUNCHER_NAME; + QString LAUNCHER_APP_BINARY_NAME; QString LAUNCHER_DISPLAYNAME; QString LAUNCHER_COPYRIGHT; QString LAUNCHER_DOMAIN; diff --git a/launcher/Application.cpp b/launcher/Application.cpp index babf824a..97f757f7 100644 --- a/launcher/Application.cpp +++ b/launcher/Application.cpp @@ -1571,7 +1571,7 @@ QString Application::getJarPath(QString jarFile) { QStringList potentialPaths = { #if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD) - FS::PathCombine(m_rootPath, "share/" + BuildConfig.LAUNCHER_NAME), + FS::PathCombine(m_rootPath, "share/" + BuildConfig.LAUNCHER_APP_BINARY_NAME), #endif FS::PathCombine(m_rootPath, "jars"), FS::PathCombine(applicationDirPath(), "jars") |