diff options
| author | Rachel Powers <508861+Ryex@users.noreply.github.com> | 2023-06-23 09:13:52 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-23 09:13:52 -0700 |
| commit | 046d510134a0061c0a1fa89fda80355c9e2f11ff (patch) | |
| tree | fcbceeb50d29cde8f5378246aceebea33b60bcc1 /launcher/modplatform/atlauncher/ATLPackInstallTask.cpp | |
| parent | 8df5ab8aa7ec32ee3c44e2b57dc9c9f04e093d9d (diff) | |
| parent | 85bbab0e9284e35b0fec26405537c9160496974f (diff) | |
| download | PrismLauncher-046d510134a0061c0a1fa89fda80355c9e2f11ff.tar.gz PrismLauncher-046d510134a0061c0a1fa89fda80355c9e2f11ff.tar.bz2 PrismLauncher-046d510134a0061c0a1fa89fda80355c9e2f11ff.zip | |
Merge pull request #1200 from Trial97/net_job_crash
Made ByteSynkArray to use shared_ptr
Diffstat (limited to 'launcher/modplatform/atlauncher/ATLPackInstallTask.cpp')
| -rw-r--r-- | launcher/modplatform/atlauncher/ATLPackInstallTask.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp b/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp index 07e0bf23..22ea02da 100644 --- a/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp +++ b/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp @@ -82,9 +82,9 @@ void PackInstallTask::executeTask() { qDebug() << "PackInstallTask::executeTask: " << QThread::currentThreadId(); NetJob::Ptr netJob{ new NetJob("ATLauncher::VersionFetch", APPLICATION->network()) }; - auto searchUrl = QString(BuildConfig.ATL_DOWNLOAD_SERVER_URL + "packs/%1/versions/%2/Configs.json") - .arg(m_pack_safe_name).arg(m_version_name); - netJob->addNetAction(Net::Download::makeByteArray(QUrl(searchUrl), &response)); + auto searchUrl = + QString(BuildConfig.ATL_DOWNLOAD_SERVER_URL + "packs/%1/versions/%2/Configs.json").arg(m_pack_safe_name).arg(m_version_name); + netJob->addNetAction(Net::Download::makeByteArray(QUrl(searchUrl), response)); QObject::connect(netJob.get(), &NetJob::succeeded, this, &PackInstallTask::onDownloadSucceeded); QObject::connect(netJob.get(), &NetJob::failed, this, &PackInstallTask::onDownloadFailed); @@ -99,11 +99,12 @@ void PackInstallTask::onDownloadSucceeded() qDebug() << "PackInstallTask::onDownloadSucceeded: " << QThread::currentThreadId(); jobPtr.reset(); - QJsonParseError parse_error {}; - QJsonDocument doc = QJsonDocument::fromJson(response, &parse_error); - if(parse_error.error != QJsonParseError::NoError) { - qWarning() << "Error while parsing JSON response from ATLauncher at " << parse_error.offset << " reason: " << parse_error.errorString(); - qWarning() << response; + QJsonParseError parse_error{}; + QJsonDocument doc = QJsonDocument::fromJson(*response, &parse_error); + if (parse_error.error != QJsonParseError::NoError) { + qWarning() << "Error while parsing JSON response from ATLauncher at " << parse_error.offset + << " reason: " << parse_error.errorString(); + qWarning() << *response.get(); return; } auto obj = doc.object(); |