Deploy jars instead of extracting them at runtime, remove non-working nvidia fix
This commit is contained in:
@@ -1,26 +1,20 @@
|
||||
#include "JavaChecker.h"
|
||||
#include "MultiMC.h"
|
||||
#include <pathutils.h>
|
||||
#include <QFile>
|
||||
#include <QProcess>
|
||||
#include <QMap>
|
||||
#include <QTemporaryFile>
|
||||
|
||||
#define CHECKER_FILE "JavaChecker.jar"
|
||||
|
||||
JavaChecker::JavaChecker(QObject *parent) : QObject(parent)
|
||||
{
|
||||
}
|
||||
|
||||
void JavaChecker::performCheck()
|
||||
{
|
||||
checkerJar.setFileTemplate("checker_XXXXXX.jar");
|
||||
checkerJar.open();
|
||||
QFile inner(":/java/checker.jar");
|
||||
inner.open(QIODevice::ReadOnly);
|
||||
checkerJar.write(inner.readAll());
|
||||
inner.close();
|
||||
checkerJar.close();
|
||||
QString checkerJar = PathCombine(MMC->bin(), "jars", "JavaCheck.jar");
|
||||
|
||||
QStringList args = {"-jar", checkerJar.fileName()};
|
||||
QStringList args = {"-jar", checkerJar};
|
||||
|
||||
process.reset(new QProcess());
|
||||
process->setArguments(args);
|
||||
@@ -42,7 +36,6 @@ void JavaChecker::finished(int exitcode, QProcess::ExitStatus status)
|
||||
killTimer.stop();
|
||||
QProcessPtr _process;
|
||||
_process.swap(process);
|
||||
checkerJar.remove();
|
||||
|
||||
JavaCheckResult result;
|
||||
{
|
||||
@@ -100,7 +93,6 @@ void JavaChecker::error(QProcess::ProcessError err)
|
||||
if(err == QProcess::FailedToStart)
|
||||
{
|
||||
killTimer.stop();
|
||||
checkerJar.remove();
|
||||
|
||||
JavaCheckResult result;
|
||||
{
|
||||
|
Reference in New Issue
Block a user