diff options
Diffstat (limited to 'api/logic/java/JavaInstallList.cpp')
| -rw-r--r-- | api/logic/java/JavaInstallList.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/api/logic/java/JavaInstallList.cpp b/api/logic/java/JavaInstallList.cpp index 44ac861d..9d2e2f8b 100644 --- a/api/logic/java/JavaInstallList.cpp +++ b/api/logic/java/JavaInstallList.cpp @@ -1,4 +1,4 @@ -/* Copyright 2013-2017 MultiMC Contributors +/* Copyright 2013-2018 MultiMC Contributors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -150,7 +150,7 @@ void JavaListLoadTask::executeTask() QList<QString> candidate_paths = ju.FindJavaPaths(); m_job = std::shared_ptr<JavaCheckerJob>(new JavaCheckerJob("Java detection")); - connect(m_job.get(), SIGNAL(finished(QList<JavaCheckResult>)), this, SLOT(javaCheckerFinished(QList<JavaCheckResult>))); + connect(m_job.get(), &Task::finished, this, &JavaListLoadTask::javaCheckerFinished); connect(m_job.get(), &Task::progress, this, &Task::setProgress); qDebug() << "Probing the following Java paths: "; @@ -170,9 +170,10 @@ void JavaListLoadTask::executeTask() m_job->start(); } -void JavaListLoadTask::javaCheckerFinished(QList<JavaCheckResult> results) +void JavaListLoadTask::javaCheckerFinished() { QList<JavaInstallPtr> candidates; + auto results = m_job->getResults(); qDebug() << "Found the following valid Java installations:"; for(JavaCheckResult result : results) |