From 084a989a7acdaf0313361ff4d36420c4db41df00 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Tue, 11 Jul 2017 21:21:42 -0700
Subject: [PATCH] stopAndDeleteLater is now just stop

---
 libraries/audio/src/AudioInjector.cpp               | 6 +-----
 libraries/audio/src/AudioInjector.h                 | 1 -
 libraries/audio/src/AudioInjectorManager.cpp        | 2 +-
 libraries/script-engine/src/ScriptAudioInjector.cpp | 2 +-
 4 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/libraries/audio/src/AudioInjector.cpp b/libraries/audio/src/AudioInjector.cpp
index d7cb77bc7f..1b16a28546 100644
--- a/libraries/audio/src/AudioInjector.cpp
+++ b/libraries/audio/src/AudioInjector.cpp
@@ -413,16 +413,12 @@ void AudioInjector::triggerDeleteAfterFinish() {
     }
 
     if (stateHas(AudioInjectorState::Finished)) {
-        stopAndDeleteLater();
+        stop();
     } else {
         _state |= AudioInjectorState::PendingDelete;
     }
 }
 
-void AudioInjector::stopAndDeleteLater() {
-    stop();
-}
-
 AudioInjectorPointer AudioInjector::playSound(SharedSoundPointer sound, const float volume,
                                               const float stretchFactor, const glm::vec3 position) {
     if (!sound || !sound->isReady()) {
diff --git a/libraries/audio/src/AudioInjector.h b/libraries/audio/src/AudioInjector.h
index 09ce1d32b8..aed51c5f85 100644
--- a/libraries/audio/src/AudioInjector.h
+++ b/libraries/audio/src/AudioInjector.h
@@ -84,7 +84,6 @@ public slots:
 
     void stop();
     void triggerDeleteAfterFinish();
-    void stopAndDeleteLater();
 
     const AudioInjectorOptions& getOptions() const { return _options; }
     void setOptions(const AudioInjectorOptions& options);
diff --git a/libraries/audio/src/AudioInjectorManager.cpp b/libraries/audio/src/AudioInjectorManager.cpp
index e8a46ba2b4..a2f8de8da9 100644
--- a/libraries/audio/src/AudioInjectorManager.cpp
+++ b/libraries/audio/src/AudioInjectorManager.cpp
@@ -30,7 +30,7 @@ AudioInjectorManager::~AudioInjectorManager() {
         auto& timePointerPair = _injectors.top();
 
         // ask it to stop and be deleted
-        timePointerPair.second->stopAndDeleteLater();
+        timePointerPair.second->stop();
 
         _injectors.pop();
     }
diff --git a/libraries/script-engine/src/ScriptAudioInjector.cpp b/libraries/script-engine/src/ScriptAudioInjector.cpp
index 1b734e8cdf..516f62401f 100644
--- a/libraries/script-engine/src/ScriptAudioInjector.cpp
+++ b/libraries/script-engine/src/ScriptAudioInjector.cpp
@@ -44,5 +44,5 @@ ScriptAudioInjector::~ScriptAudioInjector() {
 
 void ScriptAudioInjector::stopInjectorImmediately() {
     qCDebug(scriptengine) << "ScriptAudioInjector::stopInjectorImmediately called to stop audio injector immediately.";
-    _injector->stopAndDeleteLater();
+    _injector->stop();
 }