summaryrefslogtreecommitdiffstats
path: root/logic/java
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 /logic/java
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 'logic/java')
-rw-r--r--logic/java/JavaChecker.cpp2
-rw-r--r--logic/java/JavaChecker.h2
2 files changed, 2 insertions, 2 deletions
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;