Merge pull request #15589 from endragor/defer-audio-server-destr
Destroy AudioServer after other non-core types are unregistered
This commit is contained in:
commit
2f8701a71a
|
@ -1845,11 +1845,6 @@ void Main::cleanup() {
|
||||||
EditorNode::unregister_editor_types();
|
EditorNode::unregister_editor_types();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (audio_server) {
|
|
||||||
audio_server->finish();
|
|
||||||
memdelete(audio_server);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (arvr_server) {
|
if (arvr_server) {
|
||||||
// cleanup now before we pull the rug from underneath...
|
// cleanup now before we pull the rug from underneath...
|
||||||
memdelete(arvr_server);
|
memdelete(arvr_server);
|
||||||
|
@ -1861,6 +1856,11 @@ void Main::cleanup() {
|
||||||
unregister_scene_types();
|
unregister_scene_types();
|
||||||
unregister_server_types();
|
unregister_server_types();
|
||||||
|
|
||||||
|
if (audio_server) {
|
||||||
|
audio_server->finish();
|
||||||
|
memdelete(audio_server);
|
||||||
|
}
|
||||||
|
|
||||||
OS::get_singleton()->finalize();
|
OS::get_singleton()->finalize();
|
||||||
finalize_physics();
|
finalize_physics();
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue