From eac892965e152519a6d7278504e7d4118aa7c01f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Tue, 26 Sep 2017 01:39:39 +0200
Subject: NOISSUE make sure MultiMC and Flame import is mutually exclusive

---
 api/logic/InstanceImportTask.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'api/logic/InstanceImportTask.cpp')

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."));
-- 
cgit v1.2.3