From c4ec6bc0f552fe7af693d52826c82f1e7db908de Mon Sep 17 00:00:00 2001 From: Petr Mrázek Date: Sat, 7 Jan 2017 06:52:09 +0100 Subject: 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 --- api/logic/java/JavaChecker.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'api/logic/java/JavaChecker.h') 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 QProcessPtr; -- cgit