godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ensure that tree_exited signal really happens after tree exited, fixes #19641

Browse Source
This commit is contained in:
Juan Linietsky 2018-09-07 15:31:19 -03:00
parent fc50728d45
commit 4b6846a59d
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
scene/main/node.cpp
View File

@ -238,6 +238,16 @@ void Node::_propagate_enter_tree() {
// enter groups // enter groups
} }
void Node::_propagate_after_exit_tree() {
data.blocked++;
for (int i = 0; i < data.children.size(); i++) {
data.children[i]->_propagate_after_exit_tree();
}
data.blocked--;
emit_signal(SceneStringNames::get_singleton()->tree_exited);
}
void Node::_propagate_exit_tree() { void Node::_propagate_exit_tree() {
//block while removing children //block while removing children
@ -299,8 +309,6 @@ void Node::_propagate_exit_tree() {
data.ready_notified = false; data.ready_notified = false;
data.tree = NULL; data.tree = NULL;
data.depth = -1; data.depth = -1;
emit_signal(SceneStringNames::get_singleton()->tree_exited);
} }
void Node::move_child(Node *p_child, int p_pos) { void Node::move_child(Node *p_child, int p_pos) {
@ -1207,6 +1215,10 @@ void Node::remove_child(Node *p_child) {
// validate owner // validate owner
p_child->_propagate_validate_owner(); p_child->_propagate_validate_owner();
if (data.inside_tree) {
p_child->_propagate_after_exit_tree();
}
} }
int Node::get_child_count() const { int Node::get_child_count() const {

1
scene/main/node.h
View File

@ -166,6 +166,7 @@ private:
void _propagate_enter_tree(); void _propagate_enter_tree();
void _propagate_ready(); void _propagate_ready();
void _propagate_exit_tree(); void _propagate_exit_tree();
void _propagate_after_exit_tree();
void _propagate_validate_owner(); void _propagate_validate_owner();
void _print_stray_nodes(); void _print_stray_nodes();
void _propagate_pause_owner(Node *p_owner); void _propagate_pause_owner(Node *p_owner);

1
scene/main/scene_tree.cpp
View File

@ -598,6 +598,7 @@ void SceneTree::finish() {
if (root) { if (root) {
root->_set_tree(NULL); root->_set_tree(NULL);
root->_propagate_after_exit_tree();
memdelete(root); //delete root memdelete(root); //delete root
} }
} }