Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_retry_dialog

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97
2024-06-10 09:01:01 +03:00
135 changed files with 3160 additions and 1424 deletions

View File

@ -43,11 +43,15 @@
#include "ui/dialogs/CustomMessageBox.h"
#endif
NetJob::NetJob(QString job_name, shared_qobject_ptr<QNetworkAccessManager> network) : ConcurrentTask(nullptr, job_name), m_network(network)
NetJob::NetJob(QString job_name, shared_qobject_ptr<QNetworkAccessManager> network, int max_concurrent)
: ConcurrentTask(nullptr, job_name), m_network(network)
{
#if defined(LAUNCHER_APPLICATION)
setMaxConcurrent(APPLICATION->settings()->get("NumberOfConcurrentDownloads").toInt());
if (max_concurrent < 0)
max_concurrent = APPLICATION->settings()->get("NumberOfConcurrentDownloads").toInt();
#endif
if (max_concurrent > 0)
setMaxConcurrent(max_concurrent);
}
auto NetJob::addNetAction(Net::NetRequest::Ptr action) -> bool