From df2153186d6c6005137f0854cd7dad0bddd72c07 Mon Sep 17 00:00:00 2001
From: EdgarPironti <pacepiro@hotmail.it>
Date: Fri, 20 Nov 2015 16:04:28 -0800
Subject: [PATCH] Fixes

---
 .../src/RecordingScriptingInterface.cpp       | 19 ++++++++++++++-----
 .../src/RecordingScriptingInterface.h         |  4 +---
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/libraries/script-engine/src/RecordingScriptingInterface.cpp b/libraries/script-engine/src/RecordingScriptingInterface.cpp
index 36ef88354e..1a88d6e260 100644
--- a/libraries/script-engine/src/RecordingScriptingInterface.cpp
+++ b/libraries/script-engine/src/RecordingScriptingInterface.cpp
@@ -18,6 +18,10 @@
 #include <recording/Frame.h>
 #include <recording/ClipCache.h>
 
+
+#include <QtScript/QScriptValue>
+#include <AssetClient.h>
+#include <AssetUpload.h>
 #include <QtCore/QUrl>
 #include <QtWidgets/QFileDialog>
 
@@ -176,13 +180,18 @@ void RecordingScriptingInterface::saveRecording(const QString& filename) {
 }
 
 bool RecordingScriptingInterface::saveRecordingToAsset(QScriptValue getClipAtpUrl) {
-	if (!getClipAtpUrl.isFunction())
+    if (!getClipAtpUrl.isFunction()) {
+        qCWarning(scriptengine) << "The argument is not a function.";
         return false;
+    }
+
 
     if (QThread::currentThread() != thread()) {
+        bool result{ false };
         QMetaObject::invokeMethod(this, "saveRecordingToAsset", Qt::BlockingQueuedConnection,
-            Q_ARG(QScriptValue, getClipAtpUrl));
-        return false;
+            Q_ARG(QScriptValue, getClipAtpUrl),
+            Q_RETURN_ARG(bool, result));
+        return result;
     }
 
     if (!_lastClip) {
@@ -192,7 +201,6 @@ bool RecordingScriptingInterface::saveRecordingToAsset(QScriptValue getClipAtpUr
 
     if (auto upload = DependencyManager::get<AssetClient>()->createUpload(recording::Clip::toBuffer(_lastClip), HFR_EXTENSION)) {
         QObject::connect(upload, &AssetUpload::finished, this, [=](AssetUpload* upload, const QString& hash) mutable {
-            auto filename = QFileInfo(upload->getFilename()).fileName();
             QString clip_atp_url = "";
 
             if (upload->getError() == AssetUpload::NoError) {
@@ -200,7 +208,7 @@ bool RecordingScriptingInterface::saveRecordingToAsset(QScriptValue getClipAtpUr
                 clip_atp_url = QString("%1:%2.%3").arg(URL_SCHEME_ATP, hash, upload->getExtension());
                 upload->deleteLater();
             } else {
-                qDebug() << "Error during the Asset upload.";
+                qCWarning(scriptengine) << "Error during the Asset upload.";
             }
 
             QScriptValueList args;
@@ -211,6 +219,7 @@ bool RecordingScriptingInterface::saveRecordingToAsset(QScriptValue getClipAtpUr
         return true;
     }
 
+    qCWarning(scriptengine) << "Saving on asset failed.";
     return false;
 }
 
diff --git a/libraries/script-engine/src/RecordingScriptingInterface.h b/libraries/script-engine/src/RecordingScriptingInterface.h
index c1287a42d7..9661ee9d80 100644
--- a/libraries/script-engine/src/RecordingScriptingInterface.h
+++ b/libraries/script-engine/src/RecordingScriptingInterface.h
@@ -18,9 +18,7 @@
 #include <recording/Forward.h>
 #include <recording/Frame.h>
 
-#include <QtScript/QScriptValue>
-#include <AssetClient.h>
-#include <AssetUpload.h>
+class QScriptValue;
 
 class RecordingScriptingInterface : public QObject, public Dependency {
     Q_OBJECT