NOISSUE windows hates me
This commit is contained in:
		@@ -27,9 +27,9 @@ void JavaCommon::TestCheck::javaWasOk(JavaCheckResult result)
 | 
			
		||||
	QString text;
 | 
			
		||||
	text += tr("Java test succeeded!<br />Platform reported: %1<br />Java version "
 | 
			
		||||
			   "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 />");
 | 
			
		||||
		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)
 | 
			
		||||
{
 | 
			
		||||
	auto htmlError = result.stderr;
 | 
			
		||||
	auto htmlError = result.errorLog;
 | 
			
		||||
	QString text;
 | 
			
		||||
	htmlError.replace('\n', "<br />");
 | 
			
		||||
	text += tr("The specified java binary didn't work with the arguments you provided:<br />");
 | 
			
		||||
 
 | 
			
		||||
@@ -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;
 | 
			
		||||
 
 | 
			
		||||
@@ -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;
 | 
			
		||||
 
 | 
			
		||||
@@ -205,7 +205,7 @@ void MinecraftProcess::arm()
 | 
			
		||||
					[&](JavaCheckResult result)
 | 
			
		||||
					{
 | 
			
		||||
						successful = result.valid;
 | 
			
		||||
						errorLog = result.stderr;
 | 
			
		||||
						errorLog = result.errorLog;
 | 
			
		||||
						version = result.javaVersion;
 | 
			
		||||
						ev.exit();
 | 
			
		||||
					});
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user