From f54705e1c5311e023b2e1ebd5d4db226a7c7149e Mon Sep 17 00:00:00 2001 From: Jan Dalheimer Date: Fri, 21 Feb 2014 18:01:06 +0100 Subject: Don't assume forge for FTB instances. Fix FTB related stuff. --- logic/InstanceFactory.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'logic/InstanceFactory.cpp') diff --git a/logic/InstanceFactory.cpp b/logic/InstanceFactory.cpp index 807bccd0..2c89bf43 100644 --- a/logic/InstanceFactory.cpp +++ b/logic/InstanceFactory.cpp @@ -75,6 +75,7 @@ InstanceFactory::InstLoadError InstanceFactory::loadInstance(BaseInstance *&inst { return InstanceFactory::UnknownLoadError; } + inst->init(); return NoLoadError; } @@ -156,6 +157,8 @@ InstanceFactory::InstCreateError InstanceFactory::createInstance(BaseInstance *& return InstanceFactory::NoSuchVersion; } + inst->init(); + // FIXME: really, how do you even know? return InstanceFactory::NoCreateError; } -- cgit v1.2.3 From 4883d1526222f9804f304f4cc189d6e44cb22b97 Mon Sep 17 00:00:00 2001 From: Jan Dalheimer Date: Fri, 21 Feb 2014 19:15:59 +0100 Subject: Copying of FTB instances working again --- logic/InstanceFactory.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'logic/InstanceFactory.cpp') diff --git a/logic/InstanceFactory.cpp b/logic/InstanceFactory.cpp index 2c89bf43..d6e06133 100644 --- a/logic/InstanceFactory.cpp +++ b/logic/InstanceFactory.cpp @@ -184,6 +184,8 @@ InstanceFactory::InstCreateError InstanceFactory::copyInstance(BaseInstance *&ne if(inst_type == "LegacyFTB") m_settings->set("InstanceType", "Legacy"); + oldInstance->copy(instDir); + auto error = loadInstance(newInstance, instDir); switch (error) -- cgit v1.2.3