From c10a4a54d9ae0a3d404a3801c996e8b93ff1cab8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Mon, 4 May 2015 01:28:16 +0200 Subject: [PATCH] NOISSUE windows hates me --- application/JavaCommon.cpp | 6 +++--- logic/java/JavaChecker.cpp | 2 +- logic/java/JavaChecker.h | 2 +- logic/minecraft/MinecraftProcess.cpp | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/application/JavaCommon.cpp b/application/JavaCommon.cpp index d0a3cba30..2bec046a4 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!
Platform reported: %1
Java version " "reported: %2
").arg(result.realPlatform, result.javaVersion); - if (result.stderr.size()) + if (result.errorLog.size()) { - auto htmlError = result.stderr; + auto htmlError = result.errorLog; htmlError.replace('\n', "
"); text += tr("
Warnings:
%1").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', "
"); text += tr("The specified java binary didn't work with the arguments you provided:
"); diff --git a/logic/java/JavaChecker.cpp b/logic/java/JavaChecker.cpp index 188778982..9c8d5f687 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 29598aa44..a25eef939 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 10d30b733..1c9f614e4 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(); });