Merge pull request #15990 from SimonWalton-HiFi/scriptaudioinjector-delete-via-signal

BUGZ-984: Delete script audio-injector wrapper when wrapped object is deleted
This commit is contained in:
Howard Stearns 2019-07-30 16:57:26 -07:00 committed by GitHub
commit 63a70b02b7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions

View file

@ -30,6 +30,7 @@ ScriptAudioInjector::ScriptAudioInjector(const AudioInjectorPointer& injector) :
_injector(injector)
{
QObject::connect(injector.data(), &AudioInjector::finished, this, &ScriptAudioInjector::finished);
connect(injector.data(), &QObject::destroyed, this, &QObject::deleteLater);
}
ScriptAudioInjector::~ScriptAudioInjector() {

View file

@ -137,7 +137,7 @@ signals:
void finished();
private:
AudioInjectorPointer _injector;
QWeakPointer<AudioInjector> _injector;
friend QScriptValue injectorToScriptValue(QScriptEngine* engine, ScriptAudioInjector* const& in);
};