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

Fix crash of queue_free() when main loop is not SceneTree

This commit is contained in:
Haoyu Qiu 2022-10-25 09:31:56 +08:00
parent 98e0d59952
commit 3b08d0e852
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scene/main/node.cpp
View File

@ -2581,10 +2581,14 @@ void Node::print_orphan_nodes() {
} }
void Node::queue_free() { 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()) { if (is_inside_tree()) {
get_tree()->queue_delete(this); get_tree()->queue_delete(this);
} else { } 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);
} }
} }