Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector
This commit is contained in:
commit
23134d4b72
170 changed files with 1801 additions and 1015 deletions
|
@ -69,7 +69,8 @@ void NetRequest::executeTask()
|
|||
|
||||
if (getState() == Task::State::AbortedByUser) {
|
||||
qCWarning(logCat) << getUid().toString() << "Attempt to start an aborted Request:" << m_url.toString();
|
||||
emitAborted();
|
||||
emit aborted();
|
||||
emit finished();
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -86,10 +87,12 @@ void NetRequest::executeTask()
|
|||
break;
|
||||
case State::Inactive:
|
||||
case State::Failed:
|
||||
emitFailed();
|
||||
emit failed("Failed to initilize sink");
|
||||
emit finished();
|
||||
return;
|
||||
case State::AbortedByUser:
|
||||
emitAborted();
|
||||
emit aborted();
|
||||
emit finished();
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue