Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 12:51:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

make sure request is not nullptr before using it

Browse source
This commit is contained in:
Stephen Birarda 2015-10-13 16:49:12 -07:00
parent d22c602041
commit 574089530a
1 changed files with 22 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
interface/src/assets/ATPAssetMigrator.cpp
View file

@ -96,24 +96,29 @@ void ATPAssetMigrator::loadEntityServerFile() {
} else if (wantsToMigrateResource(modelURL)) { } else if (wantsToMigrateResource(modelURL)) {
auto request = ResourceManager::createResourceRequest(this, modelURL); auto request = ResourceManager::createResourceRequest(this, modelURL);
qCDebug(asset_migrator) << "Requesting" << modelURL << "for ATP asset migration"; if (request) {
qCDebug(asset_migrator) << "Requesting" << modelURL << "for ATP asset migration";
// add this combination of QUrl and QJsonValueRef to our multi hash so we can change the URL
// to an ATP one once ready
_pendingReplacements.insert(modelURL, jsonValue);
connect(request, &ResourceRequest::finished, this, [=]() {
if (request->getResult() == ResourceRequest::Success) {
migrateResource(request);
} else {
QMessageBox::warning(_dialogParent, "Error",
QString("Could not retrieve asset at %1").arg(modelURL.toString()));
}
request->deleteLater();
});
request->send();
} else {
QMessageBox::warning(_dialogParent, "Error",
QString("Could not create request for asset at %1").arg(modelURL.toString()));
}
// add this combination of QUrl and QJsonValueRef to our multi hash so we can change the URL
// to an ATP one once ready
_pendingReplacements.insert(modelURL, jsonValue);
connect(request, &ResourceRequest::finished, this, [=]() {
if (request->getResult() == ResourceRequest::Success) {
migrateResource(request);
} else {
QMessageBox::warning(_dialogParent, "Error",
QString("Could not retreive asset at %1").arg(modelURL.toString()));
}
request->deleteLater();
});
request->send();
} else { } else {
_ignoredUrls.insert(modelURL); _ignoredUrls.insert(modelURL);
} }