diff options
| author | Petr Mrázek <peterix@gmail.com> | 2016-01-02 00:35:54 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2016-01-02 00:35:54 +0100 |
| commit | a008efd24e81441a23ff3e81320ac3522251327e (patch) | |
| tree | f73886925814cc4cfb397be9f8342f7963d8f8d7 /application/JavaCommon.cpp | |
| parent | 5f57df81109d268c79b34aac799fc7694ec5882a (diff) | |
| download | MultiMC-a008efd24e81441a23ff3e81320ac3522251327e.tar MultiMC-a008efd24e81441a23ff3e81320ac3522251327e.tar.gz MultiMC-a008efd24e81441a23ff3e81320ac3522251327e.tar.lz MultiMC-a008efd24e81441a23ff3e81320ac3522251327e.tar.xz MultiMC-a008efd24e81441a23ff3e81320ac3522251327e.zip | |
GH-1365 rework java version parsing and sorting
Diffstat (limited to 'application/JavaCommon.cpp')
| -rw-r--r-- | application/JavaCommon.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/application/JavaCommon.cpp b/application/JavaCommon.cpp index 2bec046a..403883e7 100644 --- a/application/JavaCommon.cpp +++ b/application/JavaCommon.cpp @@ -26,7 +26,7 @@ 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); + "reported: %2<br />").arg(result.realPlatform, result.javaVersion.toString()); if (result.errorLog.size()) { auto htmlError = result.errorLog; @@ -87,7 +87,7 @@ void JavaCommon::TestCheck::checkFinished(JavaCheckResult result) checker->m_args = m_args; checker->m_minMem = m_minMem; checker->m_maxMem = m_maxMem; - if (Strings::naturalCompare(result.javaVersion, "1.8", Qt::CaseInsensitive) < 0) + if (result.javaVersion.requiresPermGen()) { checker->m_permGen = m_permGen; } |