Commit 6480efba by Rémi Verschelde

Main::cleanup: Move MessageQueue deletion further down where it's safer

Partial revert of #15702 which triggered the issue. Fixes #39786.
parent 4c0b077f
......@@ -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();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment