History

short circuit the mapping operations for invalid path/hash

Stephen Birarda committed 10 years ago

Commit 99718e91 parent b0c326f8 files · +252 −148Browse files

Showing the changes to libraries/script-engine/src/AssetScriptingInterface.cpp (1 of 8 files). Show all

Unified · Split

libraries/script-engine/src/AssetScriptingInterface.cpp+2−2
@@ -34,7 +34,7 @@ void AssetScriptingInterface::uploadData(QString data, QScriptValue callback) { · 33 unmodified lines
34 34
35 QObject::connect(upload, &AssetUpload::finished, this, [this, callback](AssetUpload* upload, const QString& hash) mutable {35 QObject::connect(upload, &AssetUpload::finished, this, [this, callback](AssetUpload* upload, const QString& hash) mutable {
36 if (callback.isFunction()) {36 if (callback.isFunction()) {
37 QString url = "atp://" + hash;37 QString url = "atp:" + hash;
38 QScriptValueList args { url };38 QScriptValueList args { url };
39 callback.call(_engine->currentContext()->thisObject(), args);39 callback.call(_engine->currentContext()->thisObject(), args);
40 }40 }
@@ -43,7 +43,7 @@ void AssetScriptingInterface::uploadData(QString data, QScriptValue callback) { · 2 unmodified lines
43}43}
44 44
45void AssetScriptingInterface::downloadData(QString urlString, QScriptValue callback) {45void AssetScriptingInterface::downloadData(QString urlString, QScriptValue callback) {
46 const QString ATP_SCHEME { "atp://" };46 const QString ATP_SCHEME { "atp:" };
47 47
48 if (!urlString.startsWith(ATP_SCHEME)) {48 if (!urlString.startsWith(ATP_SCHEME)) {
49 return;49 return;