GH-1365 rework java version parsing and sorting

2016-01-02 00:35:54 +01:00
parent 5f57df8110
commit a008efd24e
23 changed files with 414 additions and 138 deletions
--- a/logic/launch/steps/CheckJava.cpp
+++ b/logic/launch/steps/CheckJava.cpp
@ -83,9 +83,9 @@ void CheckJava::checkJavaFinished(JavaCheckResult result)
 	else
 	{
 		auto instance = m_parent->instance();
-		emit logLine(tr("Java version is %1!\n").arg(result.javaVersion),
+		emit logLine(tr("Java version is %1!\n").arg(result.javaVersion.toString()),
 					 MessageLevel::MultiMC);
-		instance->settings()->set("JavaVersion", result.javaVersion);
+		instance->settings()->set("JavaVersion", result.javaVersion.toString());
 		instance->settings()->set("JavaTimestamp", m_javaUnixTime);
 		emitSucceeded();
 	}