summaryrefslogtreecommitdiffstats
path: root/logic/OneSixInstance.h
diff options
context:
space:
mode:
authorAndrew <forkk@forkk.net>2013-12-09 12:06:33 -0600
committerAndrew <forkk@forkk.net>2013-12-09 12:06:33 -0600
commit712b87c643bbd7bc4ed2cfd459d0b9fdb69e5f0d (patch)
tree3a525b7e4488a7ea03521ddff33800ef81f92f07 /logic/OneSixInstance.h
parent7f52bed9e3f559adcbcf3f3c1c7ac2251964db8c (diff)
parentb0dbd4f4afcf60e4021cbb3218bfe280c4989859 (diff)
downloadMultiMC-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/OneSixInstance.h')
-rw-r--r--logic/OneSixInstance.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/logic/OneSixInstance.h b/logic/OneSixInstance.h
index 7ea2d08b..cdfdf324 100644
--- a/logic/OneSixInstance.h
+++ b/logic/OneSixInstance.h
@@ -39,7 +39,7 @@ public:
QString loaderModsDir() const;
virtual QString instanceConfigFolder() const override;
- virtual std::shared_ptr<Task> doUpdate(bool prepare_for_launch) override;
+ virtual std::shared_ptr<Task> doUpdate(bool only_prepare) override;
virtual MinecraftProcess *prepareForLaunch(MojangAccountPtr account) override;
virtual void cleanupAfterRun() override;