Sneederix/sneedmc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

GH-1713 fix FTB loading crashes

Browse Source
This commit is contained in:
Petr Mrázek 2016-11-09 01:22:02 +01:00
parent 01649f761d
commit b6f133f579
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/logic/InstanceList.cpp
View File

@ -159,7 +159,10 @@ InstanceList::InstListError InstanceList::loadList(bool complete)
else else
{ {
InstancePtr instPtr = provider->loadInstance(id); InstancePtr instPtr = provider->loadInstance(id);
newList.append(instPtr); if(instPtr)
{
newList.append(instPtr);
}
} }
} }
}; };

16
api/logic/minecraft/ftb/FTBInstanceProvider.cpp
View File

@ -236,15 +236,6 @@ InstancePtr FTBInstanceProvider::createInstance(const FTBRecord & record) const
qDebug() << "Converting " << record.name << " as new."; qDebug() << "Converting " << record.name << " as new.";
auto mcVersion = std::dynamic_pointer_cast<MinecraftVersion>(ENV.getVersion("net.minecraft", record.mcVersion));
if (!mcVersion)
{
qCritical() << "Can't load instance " << record.instanceDir
<< " because minecraft version " << record.mcVersion
<< " can't be resolved.";
return nullptr;
}
if (!rootDir.exists() && !rootDir.mkpath(".")) if (!rootDir.exists() && !rootDir.mkpath("."))
{ {
qCritical() << "Can't create instance folder" << record.instanceDir; qCritical() << "Can't create instance folder" << record.instanceDir;
@ -254,7 +245,9 @@ InstancePtr FTBInstanceProvider::createInstance(const FTBRecord & record) const
auto m_settings = std::make_shared<INISettingsObject>(FS::PathCombine(record.instanceDir, "instance.cfg")); auto m_settings = std::make_shared<INISettingsObject>(FS::PathCombine(record.instanceDir, "instance.cfg"));
m_settings->registerSetting("InstanceType", "Legacy"); m_settings->registerSetting("InstanceType", "Legacy");
if (mcVersion->usesLegacyLauncher()) // all legacy versions are built in. therefore we can do this even if we don't have ALL the versions Mojang has on their servers.
auto mcVersion = std::dynamic_pointer_cast<MinecraftVersion>(ENV.getVersion("net.minecraft", record.mcVersion));
if (mcVersion && mcVersion->usesLegacyLauncher())
{ {
m_settings->set("InstanceType", "LegacyFTB"); m_settings->set("InstanceType", "LegacyFTB");
inst.reset(new LegacyFTBInstance(m_globalSettings, m_settings, record.instanceDir)); inst.reset(new LegacyFTBInstance(m_globalSettings, m_settings, record.instanceDir));
@ -264,10 +257,11 @@ InstancePtr FTBInstanceProvider::createInstance(const FTBRecord & record) const
m_settings->set("InstanceType", "OneSixFTB"); m_settings->set("InstanceType", "OneSixFTB");
inst.reset(new OneSixFTBInstance(m_globalSettings, m_settings, record.instanceDir)); inst.reset(new OneSixFTBInstance(m_globalSettings, m_settings, record.instanceDir));
} }
// initialize // initialize
{ {
SettingsObject::Lock lock(inst->settings()); SettingsObject::Lock lock(inst->settings());
inst->setIntendedVersionId(mcVersion->descriptor()); inst->setIntendedVersionId(record.mcVersion);
inst->init(); inst->init();
inst->setGroupInitial("FTB"); inst->setGroupInitial("FTB");
inst->setName(record.name); inst->setName(record.name);

2
application/MultiMC.cpp
View File

@ -258,6 +258,8 @@ MultiMC::MultiMC(int &argc, char **argv) : QApplication(argc, argv)
initIcons(); initIcons();
initThemes(); initThemes();
// make sure we have at least some minecraft versions before we init instances
minecraftlist();
initInstances(); initInstances();
initAccounts(); initAccounts();
initNetwork(); initNetwork();