aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSefa Eyeoglu <contact@scrumplex.net>2022-05-29 15:15:18 +0200
committerGitHub <noreply@github.com>2022-05-29 15:15:18 +0200
commit65d23fc9b97fa8c3eccacf284fa721fe1dabdc09 (patch)
tree546ed80764d7eb88c0db14d4fc38b178f10a229c
parent3448d7cb70b5b1239eb4428279106604423cd9e9 (diff)
parent0b3115997a970b0507665703b9e70da8b3d22423 (diff)
downloadPrismLauncher-65d23fc9b97fa8c3eccacf284fa721fe1dabdc09.tar.gz
PrismLauncher-65d23fc9b97fa8c3eccacf284fa721fe1dabdc09.tar.bz2
PrismLauncher-65d23fc9b97fa8c3eccacf284fa721fe1dabdc09.zip
Merge pull request #671 from Scrumplex/fix-importing-flame-mmc-packs
-rw-r--r--launcher/InstanceImportTask.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/launcher/InstanceImportTask.cpp b/launcher/InstanceImportTask.cpp
index 0b97430e..09c2a333 100644
--- a/launcher/InstanceImportTask.cpp
+++ b/launcher/InstanceImportTask.cpp
@@ -164,14 +164,14 @@ void InstanceImportTask::processZipPack()
QString mmcRoot = MMCZip::findFolderOfFileInZip(m_packZip.get(), "instance.cfg");
QString flameRoot = MMCZip::findFolderOfFileInZip(m_packZip.get(), "manifest.json");
- if (!mmcRoot.isEmpty())
+ if (!mmcRoot.isNull())
{
// process as MultiMC instance/pack
qDebug() << "MultiMC:" << mmcRoot;
root = mmcRoot;
m_modpackType = ModpackType::MultiMC;
}
- else if(!flameRoot.isEmpty())
+ else if(!flameRoot.isNull())
{
// process as Flame pack
qDebug() << "Flame:" << flameRoot;