Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 05:58:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libraries/script-engine/src/ScriptAudioInjector.cpp
View file

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

2
libraries/script-engine/src/ScriptAudioInjector.h
View file

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