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/OneSixInstance.cpp | |
| 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/OneSixInstance.cpp')
| -rw-r--r-- | logic/OneSixInstance.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/logic/OneSixInstance.cpp b/logic/OneSixInstance.cpp index 7a1d7dad..b18dd2ba 100644 --- a/logic/OneSixInstance.cpp +++ b/logic/OneSixInstance.cpp @@ -37,9 +37,9 @@ OneSixInstance::OneSixInstance(const QString &rootDir, SettingsObject *setting_o reloadFullVersion(); } -std::shared_ptr<Task> OneSixInstance::doUpdate(bool prepare_for_launch) +std::shared_ptr<Task> OneSixInstance::doUpdate(bool only_prepare) { - return std::shared_ptr<Task> (new OneSixUpdate(this, prepare_for_launch)); + return std::shared_ptr<Task> (new OneSixUpdate(this, only_prepare)); } QString replaceTokensIn(QString text, QMap<QString, QString> with) |