diff options
| author | Jan Dalheimer <jan@dalheimer.de> | 2014-02-01 19:58:13 +0100 |
|---|---|---|
| committer | Jan Dalheimer <jan@dalheimer.de> | 2014-02-01 19:58:13 +0100 |
| commit | 983a40698c47739fee3786cf54c917004523ea36 (patch) | |
| tree | 4a0d73577afbf430934cd878ff23674aaa7aea74 /logic/OneSixFTBInstance.cpp | |
| parent | 866d7029afa10293a57d71aecbe3629399c95d06 (diff) | |
| parent | 1936bd181f57a554ce0dd757ffe9419100eb47f4 (diff) | |
| download | PrismLauncher-983a40698c47739fee3786cf54c917004523ea36.tar.gz PrismLauncher-983a40698c47739fee3786cf54c917004523ea36.tar.bz2 PrismLauncher-983a40698c47739fee3786cf54c917004523ea36.zip | |
Merge remote-tracking branch 'upstream/feature_derpstances' into feature_derpstances
Diffstat (limited to 'logic/OneSixFTBInstance.cpp')
| -rw-r--r-- | logic/OneSixFTBInstance.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/logic/OneSixFTBInstance.cpp b/logic/OneSixFTBInstance.cpp index 54bfbe2b..ca88142a 100644 --- a/logic/OneSixFTBInstance.cpp +++ b/logic/OneSixFTBInstance.cpp @@ -104,7 +104,7 @@ bool OneSixFTBInstance::menuActionEnabled(QString action_name) const return false; } -std::shared_ptr<Task> OneSixFTBInstance::doUpdate(bool only_prepare) +std::shared_ptr<Task> OneSixFTBInstance::doUpdate() { std::shared_ptr<SequentialTask> task; task.reset(new SequentialTask(this)); @@ -112,11 +112,11 @@ std::shared_ptr<Task> OneSixFTBInstance::doUpdate(bool only_prepare) { task->addTask(std::shared_ptr<Task>(MMC->forgelist()->getLoadTask())); } - task->addTask(OneSixInstance::doUpdate(only_prepare)); + task->addTask(OneSixInstance::doUpdate()); task->addTask(std::shared_ptr<Task>(new OneSixFTBInstanceForge(m_forge->version(), this, this))); //FIXME: yes. this may appear dumb. but the previous step can change the list, so we do it all again. //TODO: Add a graph task. Construct graphs of tasks so we may capture the logic properly. - task->addTask(OneSixInstance::doUpdate(only_prepare)); + task->addTask(OneSixInstance::doUpdate()); return task; } |