ONIMAI-SMP/ShatteredPrism
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #2745 from TheKodeToad/fix-java-message

Browse Source 
Fix invalid Java path message
This commit is contained in:
seth 2024-08-22 21:33:24 -04:00 committed by GitHub
commit fd14d3e9b0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
launcher/launch/steps/CheckJava.cpp
View File

@ -45,20 +45,23 @@ void CheckJava::executeTask()
{ {
auto instance = m_parent->instance(); auto instance = m_parent->instance();
auto settings = instance->settings(); auto settings = instance->settings();
m_javaPath = FS::ResolveExecutable(settings->get("JavaPath").toString());
QString javaPathSetting = settings->get("JavaPath").toString();
m_javaPath = FS::ResolveExecutable(javaPathSetting);
bool perInstance = settings->get("OverrideJava").toBool() || settings->get("OverrideJavaLocation").toBool(); bool perInstance = settings->get("OverrideJava").toBool() || settings->get("OverrideJavaLocation").toBool();
auto realJavaPath = QStandardPaths::findExecutable(m_javaPath); auto realJavaPath = QStandardPaths::findExecutable(m_javaPath);
if (realJavaPath.isEmpty()) { if (realJavaPath.isEmpty()) {
if (perInstance) { if (perInstance) {
emit logLine(QString("The java binary \"%1\" couldn't be found. Please fix the java path " emit logLine(QString("The Java binary \"%1\" couldn't be found. Please fix the Java path "
"override in the instance's settings or disable it.") "override in the instance's settings or disable it.")
.arg(m_javaPath), .arg(javaPathSetting),
MessageLevel::Warning); MessageLevel::Warning);
} else { } else {
emit logLine(QString("The java binary \"%1\" couldn't be found. Please set up java in " emit logLine(QString("The Java binary \"%1\" couldn't be found. Please set up Java in "
"the settings.") "the settings.")
.arg(m_javaPath), .arg(javaPathSetting),
MessageLevel::Warning); MessageLevel::Warning);
} }
emitFailed(QString("Java path is not valid.")); emitFailed(QString("Java path is not valid."));