diff --git a/scene/main/node.cpp b/scene/main/node.cpp index db070a615..31e9b73d7 100644 --- a/scene/main/node.cpp +++ b/scene/main/node.cpp @@ -617,25 +617,27 @@ void Node::set_pause_mode(PauseMode p_mode) { } bool prev_inherits = data.pause_mode == PAUSE_MODE_INHERIT; + bool prev_can_process = is_inside_tree() && can_process(); data.pause_mode = p_mode; if (!is_inside_tree()) { return; //pointless } - if ((data.pause_mode == PAUSE_MODE_INHERIT) == prev_inherits) { - return; ///nothing changed - } + if ((data.pause_mode == PAUSE_MODE_INHERIT) != prev_inherits) { + Node *owner = nullptr; - Node *owner = nullptr; - - if (data.pause_mode == PAUSE_MODE_INHERIT) { - if (data.parent) { - owner = data.parent->data.pause_owner; + if (data.pause_mode == PAUSE_MODE_INHERIT) { + if (data.parent) { + owner = data.parent->data.pause_owner; + } + } else { + owner = this; } - } else { - owner = this; - } - _propagate_pause_owner(owner); + _propagate_pause_owner(owner); + } + if (prev_can_process != can_process()) { + _propagate_pause_change_notification(can_process() ? NOTIFICATION_UNPAUSED : NOTIFICATION_PAUSED); + } } Node::PauseMode Node::get_pause_mode() const { @@ -738,6 +740,16 @@ int Node::seen_by_get_count() { return data._seen_by.size(); } +void Node::_propagate_pause_change_notification(int p_notification) { + notification(p_notification); + + for (int i = 0; i < data.children.size(); i++) { + if (data.children[i]->data.pause_mode == PAUSE_MODE_INHERIT) { + data.children[i]->_propagate_pause_change_notification(p_notification); + } + } +} + void Node::set_network_master(int p_peer_id, bool p_recursive) { data.network_master = p_peer_id; diff --git a/scene/main/node.h b/scene/main/node.h index 1e780ae48..e556a12f6 100644 --- a/scene/main/node.h +++ b/scene/main/node.h @@ -223,6 +223,7 @@ private: void _print_stray_nodes(); void _propagate_pause_owner(Node *p_owner); void _propagate_groups_dirty(); + void _propagate_pause_change_notification(int p_notification); Array _get_node_and_resource(const NodePath &p_path); void _duplicate_signals(const Node *p_original, Node *p_copy) const;