diff options
| author | Forkk <forkk@forkk.net> | 2014-01-08 21:45:13 -0600 |
|---|---|---|
| committer | Forkk <forkk@forkk.net> | 2014-01-08 21:45:13 -0600 |
| commit | 06b5fa5dccdfc54496cd79e6eba6d025bc6e1204 (patch) | |
| tree | 83d2f49d9e694bdd8f8d2cdd3879e696f435ba10 /logic/JavaChecker.h | |
| parent | 51817962aa64bc5c084e33fb29a21261d19bc8f3 (diff) | |
| parent | b767d4b134148ddb3f956253a2f7f2cad831e782 (diff) | |
| download | MultiMC-06b5fa5dccdfc54496cd79e6eba6d025bc6e1204.tar MultiMC-06b5fa5dccdfc54496cd79e6eba6d025bc6e1204.tar.gz MultiMC-06b5fa5dccdfc54496cd79e6eba6d025bc6e1204.tar.lz MultiMC-06b5fa5dccdfc54496cd79e6eba6d025bc6e1204.tar.xz MultiMC-06b5fa5dccdfc54496cd79e6eba6d025bc6e1204.zip | |
Merge branch 'release-0.1'0.1
Release MultiMC version 0.1.
Diffstat (limited to 'logic/JavaChecker.h')
| -rw-r--r-- | logic/JavaChecker.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/logic/JavaChecker.h b/logic/JavaChecker.h index 291bf46c..e19895f7 100644 --- a/logic/JavaChecker.h +++ b/logic/JavaChecker.h @@ -1,7 +1,6 @@ #pragma once #include <QProcess> #include <QTimer> -#include <QTemporaryFile> #include <memory> class JavaChecker; @@ -15,6 +14,7 @@ struct JavaCheckResult QString javaVersion; bool valid = false; bool is_64bit = false; + int id; }; typedef std::shared_ptr<QProcess> QProcessPtr; @@ -27,13 +27,13 @@ public: void performCheck(); QString path; + int id; signals: void checkFinished(JavaCheckResult result); private: QProcessPtr process; QTimer killTimer; - QTemporaryFile checkerJar; public slots: void timeout(); |