Skip to content

Commit 8c6e8c7

Browse files
committed
Merge pull request godotengine#90414 from jsjtxietian/assign-crash
Fix `_node_assign` will crash when `base_node` is nullptr
2 parents dfcf803 + 7d4bdcf commit 8c6e8c7

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

editor/editor_properties.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -2755,7 +2755,8 @@ void EditorPropertyNodePath::_node_assign() {
27552755
Variant val = get_edited_property_value();
27562756
Node *n = nullptr;
27572757
if (val.get_type() == Variant::Type::NODE_PATH) {
2758-
n = get_base_node()->get_node_or_null(val);
2758+
Node *base_node = get_base_node();
2759+
n = base_node == nullptr ? nullptr : base_node->get_node_or_null(val);
27592760
} else {
27602761
n = Object::cast_to<Node>(val);
27612762
}

0 commit comments

Comments
 (0)