CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: abort and fail logic in tasks

Browse Source 
Also sets up correctly the status connections
This commit is contained in:
flow
2022-05-01 11:05:31 -03:00
parent 040ee919e5
commit 57d65177c8
4 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
launcher/net/Download.cpp
View File

@ -69,6 +69,8 @@ void Download::addValidator(Validator* v)
void Download::executeTask()
{
setStatus(tr("Downloading %1").arg(m_url.toString()));
if (getState() == Task::State::AbortedByUser) {
qWarning() << "Attempt to start an aborted Download:" << m_url.toString();
emitAborted();
@ -90,6 +92,7 @@ void Download::executeTask()
emitFailed();
return;
case State::AbortedByUser:
emitAborted();
return;
}
@ -216,13 +219,13 @@ void Download::downloadFinished()
qDebug() << "Download failed in previous step:" << m_url.toString();
m_sink->abort();
m_reply.reset();
emitFailed();
emit failed("");
return;
} else if (m_state == State::AbortedByUser) {
qDebug() << "Download aborted in previous step:" << m_url.toString();
m_sink->abort();
m_reply.reset();
emitAborted();
emit aborted();
return;
}
@ -239,7 +242,7 @@ void Download::downloadFinished()
qDebug() << "Download failed to finalize:" << m_url.toString();
m_sink->abort();
m_reply.reset();
emitFailed();
emit failed("");
return;
}