diff options
author | Petr Mrázek <peterix@gmail.com> | 2015-05-04 01:20:48 +0200 |
---|---|---|
committer | Petr Mrázek <peterix@gmail.com> | 2015-05-04 01:20:48 +0200 |
commit | 1b884d0a9dc28d8bca38fe8756482d991d0ea850 (patch) | |
tree | fabe4350a3d64123ad0801fe7c285c2150f9562b /logic/java/JavaChecker.h | |
parent | 8e9d5f56b592fd0dd0f54e747a835391a775120d (diff) | |
download | MultiMC-1b884d0a9dc28d8bca38fe8756482d991d0ea850.tar MultiMC-1b884d0a9dc28d8bca38fe8756482d991d0ea850.tar.gz MultiMC-1b884d0a9dc28d8bca38fe8756482d991d0ea850.tar.lz MultiMC-1b884d0a9dc28d8bca38fe8756482d991d0ea850.tar.xz MultiMC-1b884d0a9dc28d8bca38fe8756482d991d0ea850.zip |
GH-907 improve Java testing and PermGen deprecation handling
Diffstat (limited to 'logic/java/JavaChecker.h')
-rw-r--r-- | logic/java/JavaChecker.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/logic/java/JavaChecker.h b/logic/java/JavaChecker.h index e19895f7..29598aa4 100644 --- a/logic/java/JavaChecker.h +++ b/logic/java/JavaChecker.h @@ -12,6 +12,7 @@ struct JavaCheckResult QString mojangPlatform; QString realPlatform; QString javaVersion; + QString stderr; bool valid = false; bool is_64bit = false; int id; @@ -26,17 +27,25 @@ public: explicit JavaChecker(QObject *parent = 0); void performCheck(); - QString path; - int id; + 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(); }; |