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/MainWindow.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/MainWindow.cpp')
| -rw-r--r-- | application/MainWindow.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/application/MainWindow.cpp b/application/MainWindow.cpp index 2fab40cb..82d923bb 100644 --- a/application/MainWindow.cpp +++ b/application/MainWindow.cpp @@ -55,7 +55,7 @@ #include <auth/flows/RefreshTask.h> #include <icons/IconList.h> #include <java/JavaUtils.h> -#include <java/JavaVersionList.h> +#include <java/JavaInstallList.h> #include <launch/LaunchTask.h> #include <minecraft/MinecraftVersionList.h> #include <minecraft/LwjglVersionList.h> @@ -1638,14 +1638,14 @@ void MainWindow::checkSetDefaultJava() { qDebug() << "Java path needs resetting, showing Java selection dialog..."; - JavaVersionPtr java; + JavaInstallPtr java; VersionSelectDialog vselect(MMC->javalist().get(), tr("Select a Java version"), this, false); vselect.setResizeOn(2); vselect.exec(); if (vselect.selectedVersion()) - java = std::dynamic_pointer_cast<JavaVersion>(vselect.selectedVersion()); + java = std::dynamic_pointer_cast<JavaInstall>(vselect.selectedVersion()); else { CustomMessageBox::selectable(this, tr("Invalid version selected"), tr("You didn't select a valid Java version, so MultiMC will " |