dasha_uwu/PrismLauncher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97 2023-10-16 22:46:11 +03:00
commit 869f654a10
No known key found for this signature in database
GPG key ID: 55EF5DA53DB36318
95 changed files with 5562 additions and 415 deletions
Download patch file Download diff file Expand all files Collapse all files

16
launcher/net/NetJob.cpp
View file

@ -36,14 +36,20 @@
*/
#include "NetJob.h"
#if defined(LAUNCHER_APPLICATION)
#include "Application.h"
#endif
NetJob::NetJob(QString job_name, shared_qobject_ptr<QNetworkAccessManager> network, int max_concurrent)
: ConcurrentTask(nullptr,
job_name,
max_concurrent < 0 ? APPLICATION->settings()->get("NumberOfConcurrentDownloads").toInt() : max_concurrent)
, m_network(network)
{}
: ConcurrentTask(nullptr, job_name), m_network(network)
{
#if defined(LAUNCHER_APPLICATION)
if (max_concurrent < 0)
max_concurrent = APPLICATION->settings()->get("NumberOfConcurrentDownloads").toInt();
#endif
if (max_concurrent > 0)
setMaxConcurrent(max_concurrent);
}
auto NetJob::addNetAction(NetAction::Ptr action) -> bool
{