From e708cb98bb0f6813cedc343f33b67d23d01ec67b Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Tue, 15 Oct 2019 11:29:49 +1300
Subject: [PATCH 1/2] Fix crash in Recorder.stopRecording() when no recording
 is being made

---
 libraries/script-engine/src/RecordingScriptingInterface.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libraries/script-engine/src/RecordingScriptingInterface.cpp b/libraries/script-engine/src/RecordingScriptingInterface.cpp
index f95edb482b..21bb7fca3f 100644
--- a/libraries/script-engine/src/RecordingScriptingInterface.cpp
+++ b/libraries/script-engine/src/RecordingScriptingInterface.cpp
@@ -195,6 +195,11 @@ void RecordingScriptingInterface::startRecording() {
 }
 
 void RecordingScriptingInterface::stopRecording() {
+    if (!_recorder->isRecording()) {
+        qCWarning(scriptengine) << "Recorder is not running";
+        return;
+    }
+
     _recorder->stop();
     _lastClip = _recorder->getClip();
     _lastClip->seek(0);

From 185d6990ebc7360a31d54331d06765d2e9a1065a Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Wed, 16 Oct 2019 09:17:29 +1300
Subject: [PATCH 2/2] Add missing threading checks to Recording API methods

---
 .../src/RecordingScriptingInterface.cpp       | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/libraries/script-engine/src/RecordingScriptingInterface.cpp b/libraries/script-engine/src/RecordingScriptingInterface.cpp
index 21bb7fca3f..cbcf94662e 100644
--- a/libraries/script-engine/src/RecordingScriptingInterface.cpp
+++ b/libraries/script-engine/src/RecordingScriptingInterface.cpp
@@ -64,6 +64,11 @@ void RecordingScriptingInterface::playClip(NetworkClipLoaderPointer clipLoader,
 }
 
 void RecordingScriptingInterface::loadRecording(const QString& url, QScriptValue callback) {
+    if (QThread::currentThread() != thread()) {
+        BLOCKING_INVOKE_METHOD(this, "loadRecording", Q_ARG(const QString&, url), Q_ARG(QScriptValue, callback));
+        return;
+    }
+
     auto clipLoader = DependencyManager::get<recording::ClipCache>()->getClipLoader(url);
 
     if (clipLoader->isLoaded()) {
@@ -117,6 +122,11 @@ void RecordingScriptingInterface::startPlaying() {
 }
 
 void RecordingScriptingInterface::setPlayerVolume(float volume) {
+    if (QThread::currentThread() != thread()) {
+        BLOCKING_INVOKE_METHOD(this, "setPlayerVolume", Q_ARG(float, volume));
+        return;
+    }
+
     _player->setVolume(std::min(std::max(volume, 0.0f), 1.0f));
 }
 
@@ -137,6 +147,11 @@ void RecordingScriptingInterface::setPlayFromCurrentLocation(bool playFromCurren
 }
 
 void RecordingScriptingInterface::setPlayerLoop(bool loop) {
+    if (QThread::currentThread() != thread()) {
+        BLOCKING_INVOKE_METHOD(this, "setPlayerLoop", Q_ARG(bool, loop));
+        return;
+    }
+
     _player->loop(loop);
 }
 
@@ -200,6 +215,11 @@ void RecordingScriptingInterface::stopRecording() {
         return;
     }
 
+    if (QThread::currentThread() != thread()) {
+        BLOCKING_INVOKE_METHOD(this, "stopRecording");
+        return;
+    }
+
     _recorder->stop();
     _lastClip = _recorder->getClip();
     _lastClip->seek(0);