mirror of
https://github.com/godotengine/godot
synced 2024-09-05 09:48:26 +00:00
Cleanup function state connections when destroying instance
Co-authored-by: Adam Scott <ascott.ca@gmail.com>
This commit is contained in:
parent
cd491c6e47
commit
e9a3e49086
|
@ -1483,7 +1483,12 @@ GDScript::~GDScript() {
|
||||||
// Order matters since clearing the stack may already cause
|
// Order matters since clearing the stack may already cause
|
||||||
// the GDScriptFunctionState to be destroyed and thus removed from the list.
|
// the GDScriptFunctionState to be destroyed and thus removed from the list.
|
||||||
pending_func_states.remove(E);
|
pending_func_states.remove(E);
|
||||||
E->self()->_clear_stack();
|
GDScriptFunctionState *state = E->self();
|
||||||
|
ObjectID state_id = state->get_instance_id();
|
||||||
|
state->_clear_connections();
|
||||||
|
if (ObjectDB::get_instance(state_id)) {
|
||||||
|
state->_clear_stack();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1926,7 +1931,12 @@ GDScriptInstance::~GDScriptInstance() {
|
||||||
// Order matters since clearing the stack may already cause
|
// Order matters since clearing the stack may already cause
|
||||||
// the GDSCriptFunctionState to be destroyed and thus removed from the list.
|
// the GDSCriptFunctionState to be destroyed and thus removed from the list.
|
||||||
pending_func_states.remove(E);
|
pending_func_states.remove(E);
|
||||||
E->self()->_clear_stack();
|
GDScriptFunctionState *state = E->self();
|
||||||
|
ObjectID state_id = state->get_instance_id();
|
||||||
|
state->_clear_connections();
|
||||||
|
if (ObjectDB::get_instance(state_id)) {
|
||||||
|
state->_clear_stack();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (script.is_valid() && owner) {
|
if (script.is_valid() && owner) {
|
||||||
|
|
|
@ -296,6 +296,15 @@ void GDScriptFunctionState::_clear_stack() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void GDScriptFunctionState::_clear_connections() {
|
||||||
|
List<Object::Connection> conns;
|
||||||
|
get_signals_connected_to_this(&conns);
|
||||||
|
|
||||||
|
for (Object::Connection &c : conns) {
|
||||||
|
c.signal.disconnect(c.callable);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void GDScriptFunctionState::_bind_methods() {
|
void GDScriptFunctionState::_bind_methods() {
|
||||||
ClassDB::bind_method(D_METHOD("resume", "arg"), &GDScriptFunctionState::resume, DEFVAL(Variant()));
|
ClassDB::bind_method(D_METHOD("resume", "arg"), &GDScriptFunctionState::resume, DEFVAL(Variant()));
|
||||||
ClassDB::bind_method(D_METHOD("is_valid", "extended_check"), &GDScriptFunctionState::is_valid, DEFVAL(false));
|
ClassDB::bind_method(D_METHOD("is_valid", "extended_check"), &GDScriptFunctionState::is_valid, DEFVAL(false));
|
||||||
|
|
|
@ -624,6 +624,7 @@ public:
|
||||||
Variant resume(const Variant &p_arg = Variant());
|
Variant resume(const Variant &p_arg = Variant());
|
||||||
|
|
||||||
void _clear_stack();
|
void _clear_stack();
|
||||||
|
void _clear_connections();
|
||||||
|
|
||||||
GDScriptFunctionState();
|
GDScriptFunctionState();
|
||||||
~GDScriptFunctionState();
|
~GDScriptFunctionState();
|
||||||
|
|
Loading…
Reference in a new issue