0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NOISSUE windows hates me

Browse Source
This commit is contained in:
Petr Mrázek 2015-05-04 01:28:16 +02:00
parent 1b884d0a9d
commit c10a4a54d9
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
application/JavaCommon.cpp
View File

@ -27,9 +27,9 @@ void JavaCommon::TestCheck::javaWasOk(JavaCheckResult result)
QString text; QString text;
text += tr("Java test succeeded!<br />Platform reported: %1<br />Java version " text += tr("Java test succeeded!<br />Platform reported: %1<br />Java version "
"reported: %2<br />").arg(result.realPlatform, result.javaVersion); "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 />"); htmlError.replace('\n', "<br />");
text += tr("<br />Warnings:<br /><font color=\"orange\">%1</font>").arg(htmlError); 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) void JavaCommon::TestCheck::javaArgsWereBad(JavaCheckResult result)
{ {
auto htmlError = result.stderr; auto htmlError = result.errorLog;
QString text; QString text;
htmlError.replace('\n', "<br />"); htmlError.replace('\n', "<br />");
text += tr("The specified java binary didn't work with the arguments you provided:<br />"); text += tr("The specified java binary didn't work with the arguments you provided:<br />");

2
logic/java/JavaChecker.cpp
View File

@ -80,7 +80,7 @@ void JavaChecker::finished(int exitcode, QProcess::ExitStatus status)
result.path = m_path; result.path = m_path;
result.id = m_id; result.id = m_id;
} }
result.stderr = m_stderr; result.errorLog = m_stderr;
qDebug() << "STDOUT" << m_stdout; qDebug() << "STDOUT" << m_stdout;
qWarning() << "STDERR" << m_stderr; qWarning() << "STDERR" << m_stderr;
qDebug() << "Java checker finished with status " << status << " exit code " << exitcode; qDebug() << "Java checker finished with status " << status << " exit code " << exitcode;

2
logic/java/JavaChecker.h
View File

@ -12,7 +12,7 @@ struct JavaCheckResult
QString mojangPlatform; QString mojangPlatform;
QString realPlatform; QString realPlatform;
QString javaVersion; QString javaVersion;
QString stderr; QString errorLog;
bool valid = false; bool valid = false;
bool is_64bit = false; bool is_64bit = false;
int id; int id;

2
logic/minecraft/MinecraftProcess.cpp
View File

@ -205,7 +205,7 @@ void MinecraftProcess::arm()
[&](JavaCheckResult result) [&](JavaCheckResult result)
{ {
successful = result.valid; successful = result.valid;
errorLog = result.stderr; errorLog = result.errorLog;
version = result.javaVersion; version = result.javaVersion;
ev.exit(); ev.exit();
}); });