diff options
| author | Andrew <forkk@forkk.net> | 2013-12-09 12:06:33 -0600 |
|---|---|---|
| committer | Andrew <forkk@forkk.net> | 2013-12-09 12:06:33 -0600 |
| commit | 712b87c643bbd7bc4ed2cfd459d0b9fdb69e5f0d (patch) | |
| tree | 3a525b7e4488a7ea03521ddff33800ef81f92f07 /logic/OneSixUpdate.h | |
| parent | 7f52bed9e3f559adcbcf3f3c1c7ac2251964db8c (diff) | |
| parent | b0dbd4f4afcf60e4021cbb3218bfe280c4989859 (diff) | |
| download | MultiMC-712b87c643bbd7bc4ed2cfd459d0b9fdb69e5f0d.tar MultiMC-712b87c643bbd7bc4ed2cfd459d0b9fdb69e5f0d.tar.gz MultiMC-712b87c643bbd7bc4ed2cfd459d0b9fdb69e5f0d.tar.lz MultiMC-712b87c643bbd7bc4ed2cfd459d0b9fdb69e5f0d.tar.xz MultiMC-712b87c643bbd7bc4ed2cfd459d0b9fdb69e5f0d.zip | |
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop
Diffstat (limited to 'logic/OneSixUpdate.h')
| -rw-r--r-- | logic/OneSixUpdate.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/logic/OneSixUpdate.h b/logic/OneSixUpdate.h index 5fd2c59f..7ff9d881 100644 --- a/logic/OneSixUpdate.h +++ b/logic/OneSixUpdate.h @@ -43,8 +43,9 @@ slots: void jarlibFinished(); void jarlibFailed(); - void checkJava(); - void checkFinished(JavaCheckResult result); + void checkJavaOnline(); + void checkFinishedOnline(JavaCheckResult result); + void checkFinishedOffline(JavaCheckResult result); // extract the appropriate libraries void prepareForLaunch(); @@ -56,7 +57,7 @@ private: // target version, determined during this task std::shared_ptr<MinecraftVersion> targetVersion; BaseInstance *m_inst = nullptr; - bool m_prepare_for_launch = false; + bool m_only_prepare = false; std::shared_ptr<JavaChecker> checker; bool java_is_64bit = false; |