summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2015-05-04 01:28:16 +0200
committerPetr Mrázek <peterix@gmail.com>2015-05-04 01:28:16 +0200
commitc10a4a54d9ae0a3d404a3801c996e8b93ff1cab8 (patch)
treee71af456fbe8f51c422063bc1ad9533259e2cd17 /application
parent1b884d0a9dc28d8bca38fe8756482d991d0ea850 (diff)
downloadMultiMC-c10a4a54d9ae0a3d404a3801c996e8b93ff1cab8.tar
MultiMC-c10a4a54d9ae0a3d404a3801c996e8b93ff1cab8.tar.gz
MultiMC-c10a4a54d9ae0a3d404a3801c996e8b93ff1cab8.tar.lz
MultiMC-c10a4a54d9ae0a3d404a3801c996e8b93ff1cab8.tar.xz
MultiMC-c10a4a54d9ae0a3d404a3801c996e8b93ff1cab8.zip
NOISSUE windows hates me
Diffstat (limited to 'application')
-rw-r--r--application/JavaCommon.cpp6
1 files changed, 3 insertions, 3 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 />");