diff options
| author | Petr Mrázek <peterix@gmail.com> | 2015-05-04 01:28:16 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2015-05-04 01:28:16 +0200 |
| commit | c10a4a54d9ae0a3d404a3801c996e8b93ff1cab8 (patch) | |
| tree | e71af456fbe8f51c422063bc1ad9533259e2cd17 | |
| parent | 1b884d0a9dc28d8bca38fe8756482d991d0ea850 (diff) | |
| download | MultiMC-c10a4a54d9ae0a3d404a3801c996e8b93ff1cab8.tar MultiMC-c10a4a54d9ae0a3d404a3801c996e8b93ff1cab8.tar.gz MultiMC-c10a4a54d9ae0a3d404a3801c996e8b93ff1cab8.tar.lz MultiMC-c10a4a54d9ae0a3d404a3801c996e8b93ff1cab8.tar.xz MultiMC-c10a4a54d9ae0a3d404a3801c996e8b93ff1cab8.zip | |
NOISSUE windows hates me
| -rw-r--r-- | application/JavaCommon.cpp | 6 | ||||
| -rw-r--r-- | logic/java/JavaChecker.cpp | 2 | ||||
| -rw-r--r-- | logic/java/JavaChecker.h | 2 | ||||
| -rw-r--r-- | logic/minecraft/MinecraftProcess.cpp | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/application/JavaCommon.cpp b/application/JavaCommon.cpp index d0a3cba3..2bec046a 100644 --- a/application/JavaCommon.cpp +++ b/application/JavaCommon.cpp @@ -27,9 +27,9 @@ void JavaCommon::TestCheck::javaWasOk(JavaCheckResult result) QString text; text += tr("Java test succeeded!<br />Platform reported: %1<br />Java version " "reported: %2<br />").arg(result.realPlatform, result.javaVersion); - if (result.stderr.size()) + if (result.errorLog.size()) { - auto htmlError = result.stderr; + auto htmlError = result.errorLog; htmlError.replace('\n', "<br />"); text += tr("<br />Warnings:<br /><font color=\"orange\">%1</font>").arg(htmlError); } @@ -39,7 +39,7 @@ void JavaCommon::TestCheck::javaWasOk(JavaCheckResult result) void JavaCommon::TestCheck::javaArgsWereBad(JavaCheckResult result) { - auto htmlError = result.stderr; + auto htmlError = result.errorLog; QString text; htmlError.replace('\n', "<br />"); text += tr("The specified java binary didn't work with the arguments you provided:<br />"); diff --git a/logic/java/JavaChecker.cpp b/logic/java/JavaChecker.cpp index 18877898..9c8d5f68 100644 --- a/logic/java/JavaChecker.cpp +++ b/logic/java/JavaChecker.cpp @@ -80,7 +80,7 @@ void JavaChecker::finished(int exitcode, QProcess::ExitStatus status) result.path = m_path; result.id = m_id; } - result.stderr = m_stderr; + result.errorLog = m_stderr; qDebug() << "STDOUT" << m_stdout; qWarning() << "STDERR" << m_stderr; qDebug() << "Java checker finished with status " << status << " exit code " << exitcode; diff --git a/logic/java/JavaChecker.h b/logic/java/JavaChecker.h index 29598aa4..a25eef93 100644 --- a/logic/java/JavaChecker.h +++ b/logic/java/JavaChecker.h @@ -12,7 +12,7 @@ struct JavaCheckResult QString mojangPlatform; QString realPlatform; QString javaVersion; - QString stderr; + QString errorLog; bool valid = false; bool is_64bit = false; int id; diff --git a/logic/minecraft/MinecraftProcess.cpp b/logic/minecraft/MinecraftProcess.cpp index 10d30b73..1c9f614e 100644 --- a/logic/minecraft/MinecraftProcess.cpp +++ b/logic/minecraft/MinecraftProcess.cpp @@ -205,7 +205,7 @@ void MinecraftProcess::arm() [&](JavaCheckResult result) { successful = result.valid; - errorLog = result.stderr; + errorLog = result.errorLog; version = result.javaVersion; ev.exit(); }); |