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

Merge branch 'master' into feature/hand-controller-web-entity-integration

Browse source
This commit is contained in:
Anthony J. Thibault 2016-08-02 09:23:18 -07:00
commit ed7eaebea8
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/scripting/AssetMappingsScriptingInterface.cpp
View file

@ -62,8 +62,10 @@ void AssetMappingsScriptingInterface::getMapping(QString path, QJSValue callback
auto request = assetClient->createGetMappingRequest(path);
connect(request, &GetMappingRequest::finished, this, [this, callback](GetMappingRequest* request) mutable {
auto hash = request->getHash();
if (callback.isCallable()) {
QJSValueList args { request->getErrorString() };
QJSValueList args { request->getErrorString(), hash };
callback.call(args);
}