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
13#include "ScriptAudioInjector.h"13#include "ScriptAudioInjector.h"
14 14
15QScriptValue injectorToScriptValue(QScriptEngine* engine, ScriptAudioInjector* const& in) {15QScriptValue 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
16 // when the script goes down we want to cleanup the injector21 // when the script goes down we want to cleanup the injector
17
18 QObject::connect(engine, &QScriptEngine::destroyed, in, &ScriptAudioInjector::stopInjectorImmediately,22 QObject::connect(engine, &QScriptEngine::destroyed, in, &ScriptAudioInjector::stopInjectorImmediately,
19 Qt::DirectConnection);23 Qt::DirectConnection);
20 24