diff --git a/launcher/InstanceImportTask.cpp b/launcher/InstanceImportTask.cpp index bbf36037e..cd168dee2 100644 --- a/launcher/InstanceImportTask.cpp +++ b/launcher/InstanceImportTask.cpp @@ -154,13 +154,11 @@ void InstanceImportTask::processZipPack() qDebug() << "Flame:" << true; m_modpackType = ModpackType::Flame; stop = true; - return true; } else if (QFileInfo fileInfo(fileName); fileInfo.fileName() == "instance.cfg") { qDebug() << "MultiMC:" << true; m_modpackType = ModpackType::MultiMC; root = cleanPath(fileInfo.path()); stop = true; - return true; } QCoreApplication::processEvents(); return true; diff --git a/launcher/archive/ArchiveReader.cpp b/launcher/archive/ArchiveReader.cpp index d29963c6d..f56fd0f0a 100644 --- a/launcher/archive/ArchiveReader.cpp +++ b/launcher/archive/ArchiveReader.cpp @@ -151,7 +151,7 @@ bool ArchiveReader::File::writeFile(archive* out, QString targetFileName, bool n auto r = archive_write_finish_entry(out); if (r < ARCHIVE_OK) qCritical() << "Failed to finish writing entry:" << archive_error_string(out); - return (r > ARCHIVE_WARN); + return (r >= ARCHIVE_WARN); } bool ArchiveReader::parse(std::function doStuff) @@ -180,6 +180,7 @@ bool ArchiveReader::parse(std::function doStuff) archive_read_close(a); return true; } + bool ArchiveReader::parse(std::function doStuff) { return parse([doStuff](File* f, bool&) { return doStuff(f); });