diff options
| author | flow <thiagodonato300@gmail.com> | 2022-03-18 07:54:47 -0300 |
|---|---|---|
| committer | flow <thiagodonato300@gmail.com> | 2022-03-18 07:54:47 -0300 |
| commit | da43ed8ce1d804fe20c44788577a0387a698ed6e (patch) | |
| tree | c7dc3d757dd1914ad55ee5e403d6be432a7e5729 /launcher/Application.cpp | |
| parent | 8409aa2571d57f015a634a220107d199e88ba2fd (diff) | |
| parent | acdb54b88e0fbdcb46aba3ed3d90e8b7fed08357 (diff) | |
| download | PrismLauncher-da43ed8ce1d804fe20c44788577a0387a698ed6e.tar.gz PrismLauncher-da43ed8ce1d804fe20c44788577a0387a698ed6e.tar.bz2 PrismLauncher-da43ed8ce1d804fe20c44788577a0387a698ed6e.zip | |
fix silly mistakes and merge upstream
Diffstat (limited to 'launcher/Application.cpp')
| -rw-r--r-- | launcher/Application.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/launcher/Application.cpp b/launcher/Application.cpp index 0ce80d4b..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; @@ -575,9 +575,6 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv) m_settings->registerSetting("IconTheme", QString("pe_colored")); m_settings->registerSetting("ApplicationTheme", QString("system")); - // Notifications - m_settings->registerSetting("ShownNotifications", QString()); - // Remembered state m_settings->registerSetting("LastUsedGroupForNewInstance", QString()); @@ -1494,10 +1491,10 @@ QString Application::getJarsPath() { return FS::PathCombine(QCoreApplication::applicationDirPath(), "jars"); } - return m_jarsPath; + return FS::PathCombine(m_rootPath, m_jarsPath); } -QString Application::getMSAClientID() +QString Application::getMSAClientID() { QString clientIDOverride = m_settings->get("MSAClientIDOverride").toString(); if (!clientIDOverride.isEmpty()) { |