asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #78654 from Sauermann/fix-scene-load-crash

Browse source 
Fix scene load crash related to `_ready`
This commit is contained in:
Rémi Verschelde 2023-06-26 10:11:32 +02:00
commit e0de078d65
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
scene/main/node.cpp
View file

@ -595,9 +595,11 @@ void Node::_propagate_pause_notification(bool p_enable) {
notification(NOTIFICATION_UNPAUSED); notification(NOTIFICATION_UNPAUSED);
} }
data.blocked++;
for (KeyValue<StringName, Node *> &K : data.children) { for (KeyValue<StringName, Node *> &K : data.children) {
K.value->_propagate_pause_notification(p_enable); K.value->_propagate_pause_notification(p_enable);
} }
data.blocked--;
} }
Node::ProcessMode Node::get_process_mode() const { Node::ProcessMode Node::get_process_mode() const {
@ -615,12 +617,14 @@ void Node::_propagate_process_owner(Node *p_owner, int p_pause_notification, int
notification(p_enabled_notification); notification(p_enabled_notification);
} }
data.blocked++;
for (KeyValue<StringName, Node *> &K : data.children) { for (KeyValue<StringName, Node *> &K : data.children) {
Node *c = K.value; Node *c = K.value;
if (c->data.process_mode == PROCESS_MODE_INHERIT) { if (c->data.process_mode == PROCESS_MODE_INHERIT) {
c->_propagate_process_owner(p_owner, p_pause_notification, p_enabled_notification); c->_propagate_process_owner(p_owner, p_pause_notification, p_enabled_notification);
} }
} }
data.blocked--;
} }
void Node::set_multiplayer_authority(int p_peer_id, bool p_recursive) { void Node::set_multiplayer_authority(int p_peer_id, bool p_recursive) {
@ -1132,7 +1136,8 @@ void Node::_set_name_nocheck(const StringName &p_name) {
} }
void Node::set_name(const String &p_name) { void Node::set_name(const String &p_name) {
ERR_FAIL_COND_MSG(data.inside_tree && !Thread::is_main_thread(), "Changing the name to nodes inside the SceneTree is only allowed from the main thread. Use call_deferred(\"set_name\",new_name)."); ERR_FAIL_COND_MSG(data.inside_tree && !Thread::is_main_thread(), "Changing the name to nodes inside the SceneTree is only allowed from the main thread. Use `set_name.call_deferred(new_name)`.");
ERR_FAIL_COND_MSG(data.parent && data.parent->data.blocked > 0, "Parent node is busy setting up children, `set_name(new_name)` failed. Consider using `set_name.call_deferred(new_name)` instead.");
String name = p_name.validate_node_name(); String name = p_name.validate_node_name();
ERR_FAIL_COND(name.is_empty()); ERR_FAIL_COND(name.is_empty());