From fcdc6dd6fa34de97552a8d1a03272862832ae0ad Mon Sep 17 00:00:00 2001
From: Howard Stearns <howard@highfidelity.io>
Date: Fri, 19 Feb 2016 10:54:53 -0800
Subject: [PATCH] When we don't make an audo injector (because we're at a
limit), make sure the value returned to scripts is null.
---
libraries/script-engine/src/AudioScriptingInterface.cpp | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/libraries/script-engine/src/AudioScriptingInterface.cpp b/libraries/script-engine/src/AudioScriptingInterface.cpp
index a660e918a9..7e7ca77b88 100644
--- a/libraries/script-engine/src/AudioScriptingInterface.cpp
+++ b/libraries/script-engine/src/AudioScriptingInterface.cpp
@@ -45,8 +45,11 @@ ScriptAudioInjector* AudioScriptingInterface::playSound(Sound* sound, const Audi
// stereo option isn't set from script, this comes from sound metadata or filename
AudioInjectorOptions optionsCopy = injectorOptions;
optionsCopy.stereo = sound->isStereo();
-
- return new ScriptAudioInjector(AudioInjector::playSound(sound->getByteArray(), optionsCopy, _localAudioInterface));
+ auto injector = AudioInjector::playSound(sound->getByteArray(), optionsCopy, _localAudioInterface);
+ if (!injector) {
+ return NULL;
+ }
+ return new ScriptAudioInjector(injector);
} else {
qCDebug(scriptengine) << "AudioScriptingInterface::playSound called with null Sound object.";