0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NOISSUE make sure MultiMC and Flame import is mutually exclusive

Browse Source
This commit is contained in:
Petr Mrázek 2017-09-26 01:39:39 +02:00
parent 678c7ab271
commit eac892965e
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/logic/InstanceImportTask.cpp
View File

@ -97,13 +97,14 @@ void InstanceImportTask::processZipPack()
root = mmcFound; root = mmcFound;
m_modpackType = ModpackType::MultiMC; m_modpackType = ModpackType::MultiMC;
} }
if(!flameFound.isNull()) else if(!flameFound.isNull())
{ {
// process as Flame pack // process as Flame pack
qDebug() << "Flame:" << flameFound; qDebug() << "Flame:" << flameFound;
root = flameFound; root = flameFound;
m_modpackType = ModpackType::Flame; m_modpackType = ModpackType::Flame;
} }
if(m_modpackType == ModpackType::Unknown) if(m_modpackType == ModpackType::Unknown)
{ {
emitFailed(tr("Archive does not contain a recognized modpack type.")); emitFailed(tr("Archive does not contain a recognized modpack type."));