diff options
| author | flow <flowlnlnln@gmail.com> | 2022-09-26 08:25:12 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-26 08:25:12 -0300 |
| commit | 370c3aa5985698351e706e61c660a3a566a5f09b (patch) | |
| tree | 5bd62ceec118396d676cf3799edafdb806e4375d /launcher/modplatform/modpacksch/FTBPackInstallTask.cpp | |
| parent | 58a5331f7bafb149c18f560a0363daab65521262 (diff) | |
| parent | dd6f670dec7dfd1a9ad6f4595ad5447ac735c737 (diff) | |
| download | PrismLauncher-370c3aa5985698351e706e61c660a3a566a5f09b.tar.gz PrismLauncher-370c3aa5985698351e706e61c660a3a566a5f09b.tar.bz2 PrismLauncher-370c3aa5985698351e706e61c660a3a566a5f09b.zip | |
Merge pull request #894 from flowln/update_from_external_source
epic PR
Diffstat (limited to 'launcher/modplatform/modpacksch/FTBPackInstallTask.cpp')
| -rw-r--r-- | launcher/modplatform/modpacksch/FTBPackInstallTask.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/launcher/modplatform/modpacksch/FTBPackInstallTask.cpp b/launcher/modplatform/modpacksch/FTBPackInstallTask.cpp index 3c15667c..97ce1dc6 100644 --- a/launcher/modplatform/modpacksch/FTBPackInstallTask.cpp +++ b/launcher/modplatform/modpacksch/FTBPackInstallTask.cpp @@ -65,9 +65,8 @@ bool PackInstallTask::abort() if (m_mod_id_resolver_task) aborted &= m_mod_id_resolver_task->abort(); - // FIXME: This should be 'emitAborted()', but InstanceStaging doesn't connect to the abort signal yet... if (aborted) - emitFailed(tr("Aborted")); + emitAborted(); return aborted; } @@ -335,7 +334,7 @@ void PackInstallTask::install() components->saveNow(); - instance.setName(m_instName); + instance.setName(name()); instance.setIconKey(m_instIcon); instance.setManagedPack("modpacksch", QString::number(m_pack.id), m_pack.name, QString::number(m_version.id), m_version.name); instanceSettings->resumeSave(); |