From 0400e5a1f25948664c8ca50ce76cf0d6d3730dc3 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Fri, 7 Apr 2017 10:31:52 +1200
Subject: [PATCH] Report error status in setMapping() callback

---
 libraries/script-engine/src/AssetScriptingInterface.cpp | 3 ++-
 libraries/script-engine/src/AssetScriptingInterface.h   | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/libraries/script-engine/src/AssetScriptingInterface.cpp b/libraries/script-engine/src/AssetScriptingInterface.cpp
index 00fa1f3ba5..65259987c4 100644
--- a/libraries/script-engine/src/AssetScriptingInterface.cpp
+++ b/libraries/script-engine/src/AssetScriptingInterface.cpp
@@ -44,7 +44,8 @@ void AssetScriptingInterface::setMapping(QString path, QString hash, QScriptValu
 
     QObject::connect(setMappingRequest, &SetMappingRequest::finished, this, [this, callback](SetMappingRequest* request) mutable {
         if (callback.isFunction()) {
-            QScriptValueList args { };
+            QString error = request->getErrorString();
+            QScriptValueList args { error };
             callback.call(_engine->currentContext()->thisObject(), args);
         }
         request->deleteLater();
diff --git a/libraries/script-engine/src/AssetScriptingInterface.h b/libraries/script-engine/src/AssetScriptingInterface.h
index d8bc319256..0238329b73 100644
--- a/libraries/script-engine/src/AssetScriptingInterface.h
+++ b/libraries/script-engine/src/AssetScriptingInterface.h
@@ -72,6 +72,7 @@ public:
     /**jsdoc
      * Called when setMapping is complete
      * @callback Assets~setMappingCallback
+     * @param {string} error
      */
     Q_INVOKABLE void setMapping(QString path, QString hash, QScriptValue callback);