Merge pull request #4715 from jherico/audio_crash

Attempting to resolve possible crash case for scripts playing sounds
This commit is contained in:
Andrew Meadows 2015-04-28 15:58:54 -07:00
commit a121ac08b3

View file

@ -13,8 +13,12 @@
#include "ScriptAudioInjector.h"
QScriptValue injectorToScriptValue(QScriptEngine* engine, ScriptAudioInjector* const& in) {
// The AudioScriptingInterface::playSound method can return null, so we need to account for that.
if (!in) {
return QScriptValue(QScriptValue::NullValue);
}
// when the script goes down we want to cleanup the injector
QObject::connect(engine, &QScriptEngine::destroyed, in, &ScriptAudioInjector::stopInjectorImmediately,
Qt::DirectConnection);