summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2017-09-26 01:39:39 +0200
committerPetr Mrázek <peterix@gmail.com>2017-09-26 01:39:39 +0200
commiteac892965e152519a6d7278504e7d4118aa7c01f (patch)
tree408684ff7de2e93fe53279987538d562d4f433e9 /api
parent678c7ab2711f0c188368fbd4a2155ca69264506e (diff)
downloadMultiMC-eac892965e152519a6d7278504e7d4118aa7c01f.tar
MultiMC-eac892965e152519a6d7278504e7d4118aa7c01f.tar.gz
MultiMC-eac892965e152519a6d7278504e7d4118aa7c01f.tar.lz
MultiMC-eac892965e152519a6d7278504e7d4118aa7c01f.tar.xz
MultiMC-eac892965e152519a6d7278504e7d4118aa7c01f.zip
NOISSUE make sure MultiMC and Flame import is mutually exclusive
Diffstat (limited to 'api')
-rw-r--r--api/logic/InstanceImportTask.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/api/logic/InstanceImportTask.cpp b/api/logic/InstanceImportTask.cpp
index 0f2f8ba4..4e841694 100644
--- a/api/logic/InstanceImportTask.cpp
+++ b/api/logic/InstanceImportTask.cpp
@@ -97,13 +97,14 @@ void InstanceImportTask::processZipPack()
root = mmcFound;
m_modpackType = ModpackType::MultiMC;
}
- if(!flameFound.isNull())
+ else if(!flameFound.isNull())
{
// process as Flame pack
qDebug() << "Flame:" << flameFound;
root = flameFound;
m_modpackType = ModpackType::Flame;
}
+
if(m_modpackType == ModpackType::Unknown)
{
emitFailed(tr("Archive does not contain a recognized modpack type."));