Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 12:33:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Report error status in setMapping() callback

Browse source
This commit is contained in:
David Rowe 2017-04-07 10:31:52 +12:00
parent 23c937e55d
commit 0400e5a1f2
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/script-engine/src/AssetScriptingInterface.cpp
View file

@ -44,7 +44,8 @@ void AssetScriptingInterface::setMapping(QString path, QString hash, QScriptValu
QObject::connect(setMappingRequest, &SetMappingRequest::finished, this, [this, callback](SetMappingRequest* request) mutable { QObject::connect(setMappingRequest, &SetMappingRequest::finished, this, [this, callback](SetMappingRequest* request) mutable {
if (callback.isFunction()) { if (callback.isFunction()) {
QScriptValueList args { }; QString error = request->getErrorString();
QScriptValueList args { error };
callback.call(_engine->currentContext()->thisObject(), args); callback.call(_engine->currentContext()->thisObject(), args);
} }
request->deleteLater(); request->deleteLater();

1
libraries/script-engine/src/AssetScriptingInterface.h
View file

@ -72,6 +72,7 @@ public:
/**jsdoc /**jsdoc
* Called when setMapping is complete * Called when setMapping is complete
* @callback Assets~setMappingCallback * @callback Assets~setMappingCallback
* @param {string} error
*/ */
Q_INVOKABLE void setMapping(QString path, QString hash, QScriptValue callback); Q_INVOKABLE void setMapping(QString path, QString hash, QScriptValue callback);