Merge pull request #671 from Scrumplex/fix-importing-flame-mmc-packs
This commit is contained in:
commit
65d23fc9b9
@ -164,14 +164,14 @@ void InstanceImportTask::processZipPack()
|
|||||||
QString mmcRoot = MMCZip::findFolderOfFileInZip(m_packZip.get(), "instance.cfg");
|
QString mmcRoot = MMCZip::findFolderOfFileInZip(m_packZip.get(), "instance.cfg");
|
||||||
QString flameRoot = MMCZip::findFolderOfFileInZip(m_packZip.get(), "manifest.json");
|
QString flameRoot = MMCZip::findFolderOfFileInZip(m_packZip.get(), "manifest.json");
|
||||||
|
|
||||||
if (!mmcRoot.isEmpty())
|
if (!mmcRoot.isNull())
|
||||||
{
|
{
|
||||||
// process as MultiMC instance/pack
|
// process as MultiMC instance/pack
|
||||||
qDebug() << "MultiMC:" << mmcRoot;
|
qDebug() << "MultiMC:" << mmcRoot;
|
||||||
root = mmcRoot;
|
root = mmcRoot;
|
||||||
m_modpackType = ModpackType::MultiMC;
|
m_modpackType = ModpackType::MultiMC;
|
||||||
}
|
}
|
||||||
else if(!flameRoot.isEmpty())
|
else if(!flameRoot.isNull())
|
||||||
{
|
{
|
||||||
// process as Flame pack
|
// process as Flame pack
|
||||||
qDebug() << "Flame:" << flameRoot;
|
qDebug() << "Flame:" << flameRoot;
|
||||||
|
Loading…
Reference in New Issue
Block a user