mirror/MultiMC5
1
0
Fork 0
mirror of https://github.com/MultiMC/MultiMC5.git synced 2024-09-01 20:49:17 +00:00
Code Issues Projects Releases Wiki Activity

NOISSUE Emit failure on failure conditions

Browse Source 
The 'Installing modpack' dialog will no longer stay open forever,
even though the installation has failed.
This commit is contained in:
Jamie Mansfield 2021-04-14 13:43:37 +01:00
parent 87dbe82474
commit 73788f5d2f
No known key found for this signature in database
GPG Key ID: 36F61598F39F67B0
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
api/logic/modplatform/atlauncher/ATLPackInstallTask.cpp
View File

@ -188,6 +188,7 @@ QString PackInstallTask::getVersionForLoader(QString uid)
} }
emitFailed(tr("Failed to find version for %1 loader").arg(m_version.loader.type)); emitFailed(tr("Failed to find version for %1 loader").arg(m_version.loader.type));
return Q_NULLPTR;
} }
else if(m_version.loader.choose) { else if(m_version.loader.choose) {
// Fabric Loader doesn't depend on a given Minecraft version. // Fabric Loader doesn't depend on a given Minecraft version.
@ -199,6 +200,11 @@ QString PackInstallTask::getVersionForLoader(QString uid)
} }
} }
if (m_version.loader.version == Q_NULLPTR || m_version.loader.version.isEmpty()) {
emitFailed(tr("No loader version set for modpack!"));
return Q_NULLPTR;
}
return m_version.loader.version; return m_version.loader.version;
} }
@ -549,7 +555,7 @@ void PackInstallTask::onModsDownloaded() {
qDebug() << "PackInstallTask::onModsDownloaded: " << QThread::currentThreadId(); qDebug() << "PackInstallTask::onModsDownloaded: " << QThread::currentThreadId();
jobPtr.reset(); jobPtr.reset();
if(modsToExtract.size() || modsToDecomp.size() || modsToCopy.size()) { if(!modsToExtract.empty() || !modsToDecomp.empty() || !modsToCopy.empty()) {
m_modExtractFuture = QtConcurrent::run(QThreadPool::globalInstance(), this, &PackInstallTask::extractMods, modsToExtract, modsToDecomp, modsToCopy); m_modExtractFuture = QtConcurrent::run(QThreadPool::globalInstance(), this, &PackInstallTask::extractMods, modsToExtract, modsToDecomp, modsToCopy);
connect(&m_modExtractFutureWatcher, &QFutureWatcher<QStringList>::finished, this, &PackInstallTask::onModsExtracted); connect(&m_modExtractFutureWatcher, &QFutureWatcher<QStringList>::finished, this, &PackInstallTask::onModsExtracted);
connect(&m_modExtractFutureWatcher, &QFutureWatcher<QStringList>::canceled, this, [&]() connect(&m_modExtractFutureWatcher, &QFutureWatcher<QStringList>::canceled, this, [&]()
@ -656,6 +662,7 @@ void PackInstallTask::install()
// Use a component to add libraries BEFORE Minecraft // Use a component to add libraries BEFORE Minecraft
if(!createLibrariesComponent(instance.instanceRoot(), components)) { if(!createLibrariesComponent(instance.instanceRoot(), components)) {
emitFailed(tr("Failed to create libraries component"));
return; return;
} }
@ -693,6 +700,7 @@ void PackInstallTask::install()
// Use a component to fill in the rest of the data // Use a component to fill in the rest of the data
// todo: use more detection // todo: use more detection
if(!createPackComponent(instance.instanceRoot(), components)) { if(!createPackComponent(instance.instanceRoot(), components)) {
emitFailed(tr("Failed to create pack component"));
return; return;
} }