浏览代码

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

(cherry picked from commit 3b08d0e85233a594b016ae27e06b5f21536a6176)
Haoyu Qiu 2 年之前
父节点
当前提交
3b869e8027
共有 1 个文件被更改,包括 5 次插入1 次删除
  1. 5 1
      scene/main/node.cpp

+ 5 - 1
scene/main/node.cpp

@@ -2887,10 +2887,14 @@ void Node::print_stray_nodes() {
 }
 
 void Node::queue_delete() {
+	// 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);
 	}
 }