Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #39798 from akien-mga/main-keep-messagequeue-to-deinit-scene

Browse source 
Main::cleanup: Move MessageQueue deletion further down where it's safer
This commit is contained in:
Rémi Verschelde 2020-06-24 22:05:15 +02:00 • committed by GitHub
commit 7dac5bd2b0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
main/main.cpp
View file

@ -2321,8 +2321,8 @@ void Main::cleanup() {
ResourceLoader::remove_custom_loaders();
ResourceSaver::remove_custom_savers();
// Flush before uninitializing the scene, but delete the MessageQueue as late as possible.
message_queue->flush();
memdelete(message_queue);
OS::get_singleton()->delete_main_loop();
@ -2408,6 +2408,10 @@ void Main::cleanup() {
OS::get_singleton()->set_restart_on_exit(false, List<String>()); //clear list (uses memory)
}
// Now should be safe to delete MessageQueue (famous last words).
message_queue->flush();
memdelete(message_queue);
unregister_core_driver_types();
unregister_core_types();