mirror of
https://github.com/MultiMC/MultiMC5.git
synced 2024-12-27 21:15:19 +00:00
c4ec6bc0f5
* Added a button to check why Java failed * It will now avoid automatically scanning binaries that do not have 'java' in their filename * Fixed some crashes related to running too many Java checks (it only does one at a time now) * It can now distinguish between more Java failure states (not there at all, crashing, returning nonsense) * Changed '...' button to Browse button to match the wizard page subtitle * Changing minimum and maximum memory will no longer trigger a java check twice
61 lines
1.1 KiB
C++
61 lines
1.1 KiB
C++
#pragma once
|
|
#include <QProcess>
|
|
#include <QTimer>
|
|
#include <memory>
|
|
|
|
#include "multimc_logic_export.h"
|
|
|
|
#include "JavaVersion.h"
|
|
|
|
class JavaChecker;
|
|
|
|
struct MULTIMC_LOGIC_EXPORT JavaCheckResult
|
|
{
|
|
QString path;
|
|
QString mojangPlatform;
|
|
QString realPlatform;
|
|
JavaVersion javaVersion;
|
|
QString outLog;
|
|
QString errorLog;
|
|
bool is_64bit = false;
|
|
int id;
|
|
enum class Validity
|
|
{
|
|
Errored,
|
|
ReturnedInvalidData,
|
|
Valid
|
|
} validity = Validity::Errored;
|
|
};
|
|
|
|
typedef std::shared_ptr<QProcess> QProcessPtr;
|
|
typedef std::shared_ptr<JavaChecker> JavaCheckerPtr;
|
|
class MULTIMC_LOGIC_EXPORT JavaChecker : public QObject
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
explicit JavaChecker(QObject *parent = 0);
|
|
void performCheck();
|
|
|
|
QString m_path;
|
|
QString m_args;
|
|
int m_id = 0;
|
|
int m_minMem = 0;
|
|
int m_maxMem = 0;
|
|
int m_permGen = 64;
|
|
|
|
signals:
|
|
void checkFinished(JavaCheckResult result);
|
|
private:
|
|
QProcessPtr process;
|
|
QTimer killTimer;
|
|
QString m_stdout;
|
|
QString m_stderr;
|
|
public
|
|
slots:
|
|
void timeout();
|
|
void finished(int exitcode, QProcess::ExitStatus);
|
|
void error(QProcess::ProcessError);
|
|
void stdoutReady();
|
|
void stderrReady();
|
|
};
|