Merge remote-tracking branch 'upstream/master' into scriptaudioinjector-delete-via-signal

Need 985 PR.

Simon Walton committed 7 years ago

Commit 2ebc6e62 parents a9d3413 4dc67b574 files · +4918 −1033Browse files

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

Unified · Split

@@ -34,5 +34,9 @@ ScriptAudioInjector::ScriptAudioInjector(const AudioInjectorPointer& injector) : · 33 unmodified lines
34	34	}
35	35
36	36	ScriptAudioInjector::~ScriptAudioInjector() {
37		− DependencyManager::get<AudioInjectorManager>()->stop(_injector);
38		−}
	37	+ const auto audioInjectorManager = DependencyManager::get<AudioInjectorManager>();
	38	+ // AudioInjectorManager may have been destroyed on application shutdown.
	39	+ if (audioInjectorManager) {
	40	+ audioInjectorManager->stop(_injector);
	41	+ }
	42	+}