Relintai/mono
1
0
Fork 0
mirror of https://github.com/Relintai/mono.git synced 2024-11-12 10:25:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash.

Browse Source
This commit is contained in:
Relintai 2023-06-15 00:03:59 +02:00
parent 2001f6acbe
commit d3264520af
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
csharp_script.cpp
View File

@ -32,20 +32,20 @@
#include <mono/metadata/threads.h> #include <mono/metadata/threads.h>
#include "core/config/project_settings.h"
#include "core/io/json.h" #include "core/io/json.h"
#include "core/os/file_access.h" #include "core/os/file_access.h"
#include "core/os/os.h" #include "core/os/os.h"
#include "core/os/thread.h" #include "core/os/thread.h"
#include "core/config/project_settings.h"
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
#include "core/os/keyboard.h" #include "core/os/keyboard.h"
#include "editor/bindings_generator.h" #include "editor/bindings_generator.h"
#include "editor/csharp_project.h" #include "editor/csharp_project.h"
#include "editor/editor_inspector.h"
#include "editor/editor_node.h" #include "editor/editor_node.h"
#include "editor/editor_settings.h" #include "editor/editor_settings.h"
#include "editor/node_dock.h" #include "editor/node_dock.h"
#include "editor/editor_inspector.h"
#endif #endif
#ifdef DEBUG_METHODS_ENABLED #ifdef DEBUG_METHODS_ENABLED
@ -1057,9 +1057,21 @@ void CSharpLanguage::reload_assemblies(bool p_soft_reload) {
// Call OnAfterDeserialization // Call OnAfterDeserialization
CSharpInstance *csi = CAST_CSHARP_INSTANCE(obj->get_script_instance()); CSharpInstance *csi = CAST_CSHARP_INSTANCE(obj->get_script_instance());
if (csi && csi->script->script_class->implements_interface(CACHED_CLASS(ISerializationListener)))
if (csi) {
if (!csi->script.is_valid()) {
continue;
}
if (!csi->script->script_class) {
continue;
}
if (csi->script->script_class->implements_interface(CACHED_CLASS(ISerializationListener))) {
obj->get_script_instance()->call_multilevel(string_names.on_after_deserialize); obj->get_script_instance()->call_multilevel(string_names.on_after_deserialize);
} }
}
}
script->pending_reload_instances.clear(); script->pending_reload_instances.clear();
} }
@ -2827,7 +2839,7 @@ Ref<CSharpScript> CSharpScript::create_for_managed_type(GDMonoClass *p_class, GD
CRASH_COND(p_class == NULL); CRASH_COND(p_class == NULL);
// TODO OPTIMIZE: Cache the 'CSharpScript' associated with this 'p_class' instead of allocating a new one every time // TODO OPTIMIZE: Cache the 'CSharpScript' associated with this 'p_class' instead of allocating a new one every time
Ref<CSharpScript> script = memnew(CSharpScript); Ref<CSharpScript> script = Ref<CSharpScript>(memnew(CSharpScript));
initialize_for_managed_type(script, p_class, p_native); initialize_for_managed_type(script, p_class, p_native);