Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-16 00:53:26 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #72248 from RedwanFox/mainloop_init_order_fix

Browse Source 
Ensure that SceneTree is initialized and finalized at correct time
This commit is contained in:
Yuri Sizov 2023-07-12 17:16:05 +02:00
commit 7ff2a93952
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
scene/main/scene_tree.cpp
View File

@ -444,9 +444,8 @@ void SceneTree::set_group(const StringName &p_group, const String &p_name, const
void SceneTree::initialize() {
ERR_FAIL_NULL(root);
initialized = true;
root->_set_tree(this);
MainLoop::initialize();
root->_set_tree(this);
}
bool SceneTree::physics_process(double p_time) {
@ -618,20 +617,18 @@ void SceneTree::finalize() {
_flush_ugc();
initialized = false;
MainLoop::finalize();
if (root) {
root->_set_tree(nullptr);
root->_propagate_after_exit_tree();
memdelete(root); //delete root
root = nullptr;
// In case deletion of some objects was queued when destructing the `root`.
// E.g. if `queue_free()` was called for some node outside the tree when handling NOTIFICATION_PREDELETE for some node in the tree.
_flush_delete_queue();
}
// In case deletion of some objects was queued when destructing the `root`.
// E.g. if `queue_free()` was called for some node outside the tree when handling NOTIFICATION_PREDELETE for some node in the tree.
_flush_delete_queue();
MainLoop::finalize();
// Cleanup timers.
for (Ref<SceneTreeTimer> &timer : timers) {

1
scene/main/scene_tree.h
View File

@ -138,7 +138,6 @@ private:
HashMap<StringName, Group> group_map;
bool _quit = false;
bool initialized = false;
StringName tree_changed_name = "tree_changed";
StringName node_added_name = "node_added";