Fix crash of queue_free() when main loop is not SceneTree
This commit is contained in:
parent
98e0d59952
commit
3b08d0e852
1 changed files with 5 additions and 1 deletions
|
@ -2581,10 +2581,14 @@ void Node::print_orphan_nodes() {
|
|||
}
|
||||
|
||||
void Node::queue_free() {
|
||||
// There are users which instantiate multiple scene trees for their games.
|
||||
// Use the node's own tree to handle its deletion when relevant.
|
||||
if (is_inside_tree()) {
|
||||
get_tree()->queue_delete(this);
|
||||
} else {
|
||||
SceneTree::get_singleton()->queue_delete(this);
|
||||
SceneTree *tree = SceneTree::get_singleton();
|
||||
ERR_FAIL_NULL_MSG(tree, "Can't queue free a node when no SceneTree is available.");
|
||||
tree->queue_delete(this);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue