mc-in-work/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2026-06-29 01:54:20 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix: properly emit aborted instead of failed

Browse source 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
This commit is contained in:
Octol1ttle 2026-02-02 16:37:30 +05:00
parent 625f0060a1
commit 7bcd2dd768
No known key found for this signature in database
GPG key ID: B77C34313AEE1FFF
9 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
launcher/DataMigrationTask.cpp
View file

@ -63,7 +63,7 @@ void DataMigrationTask::dryRunFinished()
void DataMigrationTask::dryRunAborted() void DataMigrationTask::dryRunAborted()
{ {
emitFailed(tr("Aborted")); emitAborted();
} }
void DataMigrationTask::copyFinished() void DataMigrationTask::copyFinished()
@ -81,5 +81,5 @@ void DataMigrationTask::copyFinished()
void DataMigrationTask::copyAborted() void DataMigrationTask::copyAborted()
{ {
emitFailed(tr("Aborted")); emitAborted();
} }

2
launcher/launch/LaunchTask.cpp
View file

@ -180,7 +180,7 @@ bool LaunchTask::abort()
return true; return true;
case LaunchTask::NotStarted: { case LaunchTask::NotStarted: {
state = LaunchTask::Aborted; state = LaunchTask::Aborted;
emitFailed("Aborted"); emitAborted();
return true; return true;
} }
case LaunchTask::Running: case LaunchTask::Running:

2
launcher/launch/steps/LookupServerAddress.cpp
View file

@ -38,7 +38,7 @@ void LookupServerAddress::setOutputAddressPtr(MinecraftTarget::Ptr output)
bool LookupServerAddress::abort() bool LookupServerAddress::abort()
{ {
m_dnsLookup->abort(); m_dnsLookup->abort();
emitFailed("Aborted"); emitAborted();
return true; return true;
} }

2
launcher/launch/steps/TextPrint.cpp
View file

@ -24,6 +24,6 @@ bool TextPrint::canAbort() const
bool TextPrint::abort() bool TextPrint::abort()
{ {
emitFailed("Aborted."); emitAborted();
return true; return true;
} }

2
launcher/minecraft/MinecraftLoadAndCheck.cpp
View file

@ -20,7 +20,7 @@ void MinecraftLoadAndCheck::executeTask()
} }
connect(m_task.get(), &Task::succeeded, this, &MinecraftLoadAndCheck::emitSucceeded); connect(m_task.get(), &Task::succeeded, this, &MinecraftLoadAndCheck::emitSucceeded);
connect(m_task.get(), &Task::failed, this, &MinecraftLoadAndCheck::emitFailed); connect(m_task.get(), &Task::failed, this, &MinecraftLoadAndCheck::emitFailed);
connect(m_task.get(), &Task::aborted, this, [this] { emitFailed(tr("Aborted")); }); connect(m_task.get(), &Task::aborted, this, &MinecraftLoadAndCheck::emitAborted);
propagateFromOther(m_task.get()); propagateFromOther(m_task.get());
} }

2
launcher/minecraft/launch/AutoInstallJava.cpp
View file

@ -244,7 +244,7 @@ bool AutoInstallJava::abort()
{ {
if (m_current_task && m_current_task->canAbort()) { if (m_current_task && m_current_task->canAbort()) {
auto status = m_current_task->abort(); auto status = m_current_task->abort();
emitFailed("Aborted."); emitAborted();
return status; return status;
} }
return Task::abort(); return Task::abort();

4
launcher/minecraft/update/AssetUpdateTask.cpp
View file

@ -39,7 +39,7 @@ void AssetUpdateTask::executeTask()
connect(downloadJob.get(), &NetJob::succeeded, this, &AssetUpdateTask::assetIndexFinished); connect(downloadJob.get(), &NetJob::succeeded, this, &AssetUpdateTask::assetIndexFinished);
connect(downloadJob.get(), &NetJob::failed, this, &AssetUpdateTask::assetIndexFailed); connect(downloadJob.get(), &NetJob::failed, this, &AssetUpdateTask::assetIndexFailed);
connect(downloadJob.get(), &NetJob::aborted, this, [this] { emitFailed(tr("Aborted")); }); connect(downloadJob.get(), &NetJob::aborted, this, &AssetUpdateTask::emitAborted);
connect(downloadJob.get(), &NetJob::progress, this, &AssetUpdateTask::progress); connect(downloadJob.get(), &NetJob::progress, this, &AssetUpdateTask::progress);
connect(downloadJob.get(), &NetJob::stepProgress, this, &AssetUpdateTask::propagateStepProgress); connect(downloadJob.get(), &NetJob::stepProgress, this, &AssetUpdateTask::propagateStepProgress);
@ -82,7 +82,7 @@ void AssetUpdateTask::assetIndexFinished()
downloadJob = job; downloadJob = job;
connect(downloadJob.get(), &NetJob::succeeded, this, &AssetUpdateTask::emitSucceeded); connect(downloadJob.get(), &NetJob::succeeded, this, &AssetUpdateTask::emitSucceeded);
connect(downloadJob.get(), &NetJob::failed, this, &AssetUpdateTask::assetsFailed); connect(downloadJob.get(), &NetJob::failed, this, &AssetUpdateTask::assetsFailed);
connect(downloadJob.get(), &NetJob::aborted, this, [this] { emitFailed(tr("Aborted")); }); connect(downloadJob.get(), &NetJob::aborted, this, &AssetUpdateTask::emitAborted);
connect(downloadJob.get(), &NetJob::progress, this, &AssetUpdateTask::progress); connect(downloadJob.get(), &NetJob::progress, this, &AssetUpdateTask::progress);
connect(downloadJob.get(), &NetJob::stepProgress, this, &AssetUpdateTask::propagateStepProgress); connect(downloadJob.get(), &NetJob::stepProgress, this, &AssetUpdateTask::propagateStepProgress);
downloadJob->start(); downloadJob->start();

2
launcher/minecraft/update/LegacyFMLLibrariesTask.cpp
View file

@ -70,7 +70,7 @@ void LegacyFMLLibrariesTask::executeTask()
connect(dljob.get(), &NetJob::succeeded, this, &LegacyFMLLibrariesTask::fmllibsFinished); connect(dljob.get(), &NetJob::succeeded, this, &LegacyFMLLibrariesTask::fmllibsFinished);
connect(dljob.get(), &NetJob::failed, this, &LegacyFMLLibrariesTask::fmllibsFailed); connect(dljob.get(), &NetJob::failed, this, &LegacyFMLLibrariesTask::fmllibsFailed);
connect(dljob.get(), &NetJob::aborted, this, [this] { emitFailed(tr("Aborted")); }); connect(dljob.get(), &NetJob::aborted, this, &LegacyFMLLibrariesTask::emitAborted);
connect(dljob.get(), &NetJob::progress, this, &LegacyFMLLibrariesTask::progress); connect(dljob.get(), &NetJob::progress, this, &LegacyFMLLibrariesTask::progress);
connect(dljob.get(), &NetJob::stepProgress, this, &LegacyFMLLibrariesTask::propagateStepProgress); connect(dljob.get(), &NetJob::stepProgress, this, &LegacyFMLLibrariesTask::propagateStepProgress);
downloadJob.reset(dljob); downloadJob.reset(dljob);

2
launcher/minecraft/update/LibrariesTask.cpp
View file

@ -64,7 +64,7 @@ void LibrariesTask::executeTask()
connect(downloadJob.get(), &NetJob::succeeded, this, &LibrariesTask::emitSucceeded); connect(downloadJob.get(), &NetJob::succeeded, this, &LibrariesTask::emitSucceeded);
connect(downloadJob.get(), &NetJob::failed, this, &LibrariesTask::jarlibFailed); connect(downloadJob.get(), &NetJob::failed, this, &LibrariesTask::jarlibFailed);
connect(downloadJob.get(), &NetJob::aborted, this, [this] { emitFailed(tr("Aborted")); }); connect(downloadJob.get(), &NetJob::aborted, this, &LibrariesTask::emitAborted);
connect(downloadJob.get(), &NetJob::progress, this, &LibrariesTask::progress); connect(downloadJob.get(), &NetJob::progress, this, &LibrariesTask::progress);
connect(downloadJob.get(), &NetJob::stepProgress, this, &LibrariesTask::propagateStepProgress); connect(downloadJob.get(), &NetJob::stepProgress, this, &LibrariesTask::propagateStepProgress);