History

Attempting to resolve possible crash case for scripts playing sounds

Brad Davis committed 11 years ago

Commit 25753521 parent 20d77fa1 file · +5 −1Browse files

Showing the changes to libraries/script-engine/src/ScriptAudioInjector.cpp (1 of 1 file). Show all

Unified · Split

libraries/script-engine/src/ScriptAudioInjector.cpp+5−1
@@ -13,8 +13,12 @@ · 12 unmodified lines
1313 #include "ScriptAudioInjector.h"
1414
1515 QScriptValue injectorToScriptValue(QScriptEngine* engine, ScriptAudioInjector* const& in) {
16+ // The AudioScriptingInterface::playSound method can return null, so we need to account for that.
17+ if (!in) {
18+ return QScriptValue(QScriptValue::NullValue);
19+ }
20+
1621 // when the script goes down we want to cleanup the injector
17−
1822 QObject::connect(engine, &QScriptEngine::destroyed, in, &ScriptAudioInjector::stopInjectorImmediately,
1923 Qt::DirectConnection);
2024