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

Merge pull request #102837 from raulsntos/dotnet/fix-reload-callables

Browse Source 
[.NET] Skip serializing delegates with a disposed target
This commit is contained in:
Rémi Verschelde
2025-06-13 15:53:33 +02:00
parent 436f8be7ca 2550cdc0c4
commit 7e9b709917
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/mono/csharp_script.cpp
View File

@@ -685,8 +685,14 @@ void CSharpLanguage::reload_assemblies(bool p_soft_reload) {
if (success) { if (success) {
ManagedCallable::instances_pending_reload.insert(managed_callable, serialized_data); ManagedCallable::instances_pending_reload.insert(managed_callable, serialized_data);
} else if (OS::get_singleton()->is_stdout_verbose()) { } else {
OS::get_singleton()->print("Failed to serialize delegate\n"); if (OS::get_singleton()->is_stdout_verbose()) {
OS::get_singleton()->print("Failed to serialize delegate.\n");
}
// We failed to serialize the delegate but we still have to release it;
// otherwise, we won't be able to unload the assembly.
managed_callable->release_delegate_handle();
} }
} }
} }

6
modules/mono/glue/GodotSharp/GodotSharp/Core/DelegateUtils.cs
View File

@@ -166,6 +166,12 @@ namespace Godot
} }
case GodotObject godotObject: case GodotObject godotObject:
{ {
if (!GodotObject.IsInstanceValid(godotObject))
{
// If the delegate's target has been freed we can't serialize it.
return false;
}
using (var stream = new MemoryStream()) using (var stream = new MemoryStream())
using (var writer = new BinaryWriter(stream)) using (var writer = new BinaryWriter(stream))
{ {