godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-07 12:30:27 +00:00
Code Releases Wiki Activity

C#: Fix disconnecting event signals twice

Browse Source 
`disconnect_event_signals` can be called twice (when managed instance
is disposed and from the ScriptInstance destructor).
This commit is contained in:
Ignacio Etcheverry
2021-03-15 07:08:06 +01:00
parent b060ca680a
commit 5b3b9cd63b
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
modules/mono/csharp_script.cpp
View File

@@ -2018,22 +2018,20 @@ void CSharpInstance::connect_event_signals() {
// TODO: Use pooling for ManagedCallable instances. // TODO: Use pooling for ManagedCallable instances.
auto event_signal_callable = memnew(EventSignalCallable(owner, &event_signal)); auto event_signal_callable = memnew(EventSignalCallable(owner, &event_signal));
owner->connect(signal_name, Callable(event_signal_callable)); Callable callable(event_signal_callable);
connected_event_signals.push_back(callable);
owner->connect(signal_name, callable);
} }
} }
void CSharpInstance::disconnect_event_signals() { void CSharpInstance::disconnect_event_signals() {
for (const Map<StringName, CSharpScript::EventSignal>::Element *E = script->event_signals.front(); E; E = E->next()) { for (const List<Callable>::Element *E = connected_event_signals.front(); E; E = E->next()) {
const CSharpScript::EventSignal &event_signal = E->value(); const Callable &callable = E->get();
auto event_signal_callable = static_cast<const EventSignalCallable *>(callable.get_custom());
StringName signal_name = event_signal.field->get_name(); owner->disconnect(event_signal_callable->get_signal(), callable);
// TODO: It would be great if we could store this EventSignalCallable on the stack.
// The problem is that Callable memdeletes it when it's destructed...
auto event_signal_callable = memnew(EventSignalCallable(owner, &event_signal));
owner->disconnect(signal_name, Callable(event_signal_callable));
} }
connected_event_signals.clear();
} }
void CSharpInstance::refcount_incremented() { void CSharpInstance::refcount_incremented() {

2
modules/mono/csharp_script.h
View File

@@ -271,6 +271,8 @@ class CSharpInstance : public ScriptInstance {
Ref<CSharpScript> script; Ref<CSharpScript> script;
MonoGCHandleData gchandle; MonoGCHandleData gchandle;
List<Callable> connected_event_signals;
bool _reference_owner_unsafe(); bool _reference_owner_unsafe();
/* /*