From 7a07ed79407edcb2a543aa0dc80745a0b8c2e234 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sun, 22 Dec 2013 05:47:10 +0100 Subject: 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 --- logic/OneSixFTBInstance.cpp | 3 +++ logic/lists/ForgeVersionList.h | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) 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 OneSixFTBInstance::doUpdate(bool only_prepare) } task->addTask(OneSixInstance::doUpdate(only_prepare)); task->addTask(std::shared_ptr(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 m_vlist; - bool m_loaded; + bool m_loaded = false; protected slots: -- cgit v1.2.3