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 /logic | |
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
Diffstat (limited to 'logic')
-rw-r--r-- | logic/java/JavaChecker.cpp | 2 | ||||
-rw-r--r-- | logic/java/JavaChecker.h | 2 | ||||
-rw-r--r-- | logic/minecraft/MinecraftProcess.cpp | 2 |
3 files changed, 3 insertions, 3 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; 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(); }); |