summaryrefslogtreecommitdiffstats
path: root/api/logic/java/JavaChecker.h
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2017-01-07 06:52:09 +0100
committerPetr Mrázek <peterix@gmail.com>2017-01-07 06:52:09 +0100
commitc4ec6bc0f552fe7af693d52826c82f1e7db908de (patch)
tree9495ce54fb743bbeba188198b3cf00ec978c4603 /api/logic/java/JavaChecker.h
parent705a658fefb3f5fe4fba9b621df70ae551272864 (diff)
downloadMultiMC-c4ec6bc0f552fe7af693d52826c82f1e7db908de.tar
MultiMC-c4ec6bc0f552fe7af693d52826c82f1e7db908de.tar.gz
MultiMC-c4ec6bc0f552fe7af693d52826c82f1e7db908de.tar.lz
MultiMC-c4ec6bc0f552fe7af693d52826c82f1e7db908de.tar.xz
MultiMC-c4ec6bc0f552fe7af693d52826c82f1e7db908de.zip
NOISSUE polish the java setup wizard page
* 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
Diffstat (limited to 'api/logic/java/JavaChecker.h')
-rw-r--r--api/logic/java/JavaChecker.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/api/logic/java/JavaChecker.h b/api/logic/java/JavaChecker.h
index 650e7ce3..c6bd697c 100644
--- a/api/logic/java/JavaChecker.h
+++ b/api/logic/java/JavaChecker.h
@@ -15,10 +15,16 @@ struct MULTIMC_LOGIC_EXPORT JavaCheckResult
QString mojangPlatform;
QString realPlatform;
JavaVersion javaVersion;
+ QString outLog;
QString errorLog;
- bool valid = false;
bool is_64bit = false;
int id;
+ enum class Validity
+ {
+ Errored,
+ ReturnedInvalidData,
+ Valid
+ } validity = Validity::Errored;
};
typedef std::shared_ptr<QProcess> QProcessPtr;