diff options
| author | Petr Mrázek <peterix@gmail.com> | 2013-12-22 05:47:10 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2013-12-22 05:47:10 +0100 |
| commit | 7a07ed79407edcb2a543aa0dc80745a0b8c2e234 (patch) | |
| tree | 1a8bd8b2c8e902b926af0216cac3386709407265 | |
| parent | 245d441a6eee558557a01d61a726b7feaeb5dc17 (diff) | |
| download | MultiMC-7a07ed79407edcb2a543aa0dc80745a0b8c2e234.tar MultiMC-7a07ed79407edcb2a543aa0dc80745a0b8c2e234.tar.gz MultiMC-7a07ed79407edcb2a543aa0dc80745a0b8c2e234.tar.lz MultiMC-7a07ed79407edcb2a543aa0dc80745a0b8c2e234.tar.xz MultiMC-7a07ed79407edcb2a543aa0dc80745a0b8c2e234.zip | |
FTB fixage
* Corrected an uninitialized variable that prevented forge list loadinf on Windows
* Run the update step twice for FTB instances to ensure forge libs get downloaded
| -rw-r--r-- | logic/OneSixFTBInstance.cpp | 3 | ||||
| -rw-r--r-- | logic/lists/ForgeVersionList.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/logic/OneSixFTBInstance.cpp b/logic/OneSixFTBInstance.cpp index 924fc790..4bb5cf42 100644 --- a/logic/OneSixFTBInstance.cpp +++ b/logic/OneSixFTBInstance.cpp @@ -111,6 +111,9 @@ std::shared_ptr<Task> OneSixFTBInstance::doUpdate(bool only_prepare) } task->addTask(OneSixInstance::doUpdate(only_prepare)); 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)); return task; } diff --git a/logic/lists/ForgeVersionList.h b/logic/lists/ForgeVersionList.h index bf9e87b2..f32975ed 100644 --- a/logic/lists/ForgeVersionList.h +++ b/logic/lists/ForgeVersionList.h @@ -80,7 +80,7 @@ public: protected: QList<BaseVersionPtr> m_vlist; - bool m_loaded; + bool m_loaded = false; protected slots: |