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: NOISSUE windows hates me --- logic/java/JavaChecker.cpp | 2 +- logic/java/JavaChecker.h | 2 +- logic/minecraft/MinecraftProcess.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'logic') 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(); }); -- cgit v1.2.3