Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2024-11-21 16:37:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Backport 65910 for Godot 3

Browse Source
This commit is contained in:
Capital 2024-09-25 12:57:56 -04:00 committed by Relintai
parent b0701da063
commit 3fe6da64d4
3 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/gdscript/gdscript.cpp
View File

@ -84,7 +84,12 @@ void GDScript::_clear_pending_func_states() {
// 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();
}
} }
GDScriptLanguage::get_singleton()->lock.unlock(); GDScriptLanguage::get_singleton()->lock.unlock();
} }
@ -1339,7 +1344,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) {

9
modules/gdscript/gdscript_function.cpp
View File

@ -1859,6 +1859,15 @@ void GDScriptFunctionState::_clear_stack() {
} }
} }
void GDScriptFunctionState::_clear_connections() {
List<Object::Connection> conns;
get_signals_connected_to_this(&conns);
for (List<Object::Connection>::Element *E = conns.front(); E; E = E->next()) {
Object::Connection &c = E->get();
c.source->disconnect(c.signal, c.target, c.method);
}
}
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));

1
modules/gdscript/gdscript_function.h
View File

@ -374,6 +374,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();