diff options
| author | Petr Mrázek <peterix@gmail.com> | 2017-01-07 06:52:09 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2017-01-07 06:52:09 +0100 |
| commit | c4ec6bc0f552fe7af693d52826c82f1e7db908de (patch) | |
| tree | 9495ce54fb743bbeba188198b3cf00ec978c4603 /api/logic/java/JavaChecker.cpp | |
| parent | 705a658fefb3f5fe4fba9b621df70ae551272864 (diff) | |
| download | MultiMC-c4ec6bc0f552fe7af693d52826c82f1e7db908de.tar MultiMC-c4ec6bc0f552fe7af693d52826c82f1e7db908de.tar.gz MultiMC-c4ec6bc0f552fe7af693d52826c82f1e7db908de.tar.lz MultiMC-c4ec6bc0f552fe7af693d52826c82f1e7db908de.tar.xz MultiMC-c4ec6bc0f552fe7af693d52826c82f1e7db908de.zip | |
NOISSUE polish the java setup wizard page
* Added a button to check why Java failed
* It will now avoid automatically scanning binaries that do not have 'java' in their filename
* Fixed some crashes related to running too many Java checks (it only does one at a time now)
* It can now distinguish between more Java failure states (not there at all, crashing, returning nonsense)
* Changed '...' button to Browse button to match the wizard page subtitle
* Changing minimum and maximum memory will no longer trigger a java check twice
Diffstat (limited to 'api/logic/java/JavaChecker.cpp')
| -rw-r--r-- | api/logic/java/JavaChecker.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/api/logic/java/JavaChecker.cpp b/api/logic/java/JavaChecker.cpp index 54d552a9..daf375ad 100644 --- a/api/logic/java/JavaChecker.cpp +++ b/api/logic/java/JavaChecker.cpp @@ -80,13 +80,14 @@ void JavaChecker::finished(int exitcode, QProcess::ExitStatus status) result.id = m_id; } result.errorLog = m_stderr; + result.outLog = m_stdout; qDebug() << "STDOUT" << m_stdout; qWarning() << "STDERR" << m_stderr; qDebug() << "Java checker finished with status " << status << " exit code " << exitcode; if (status == QProcess::CrashExit || exitcode == 1) { - qDebug() << "Java checker failed!"; + result.validity = JavaCheckResult::Validity::Errored; emit checkFinished(result); return; } @@ -112,7 +113,7 @@ void JavaChecker::finished(int exitcode, QProcess::ExitStatus status) if(!results.contains("os.arch") || !results.contains("java.version") || !success) { - qDebug() << "Java checker failed - couldn't extract required information."; + result.validity = JavaCheckResult::Validity::ReturnedInvalidData; emit checkFinished(result); return; } @@ -122,7 +123,7 @@ void JavaChecker::finished(int exitcode, QProcess::ExitStatus status) bool is_64 = os_arch == "x86_64" || os_arch == "amd64"; - result.valid = true; + result.validity = JavaCheckResult::Validity::Valid; result.is_64bit = is_64; result.mojangPlatform = is_64 ? "64" : "32"; result.realPlatform = os_arch; |