godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Attach mono thread before getting nativeName field

Browse Source 
In order to access the `nativeName` constant field from a C# class, the
mono scope thread must be attached or the mono domain will be null.
This commit is contained in:
Raul Santos 2022-02-07 03:41:44 +01:00
parent 8aa4ed8b5b
commit 303f0c8626
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/mono/csharp_script.cpp
View File

@ -3245,6 +3245,8 @@ ScriptInstance *CSharpScript::instance_create(Object *p_this) {
CRASH_COND(!valid); CRASH_COND(!valid);
#endif #endif
GD_MONO_SCOPE_THREAD_ATTACH;
if (native) { if (native) {
StringName native_name = NATIVE_GDMONOCLASS_NAME(native); StringName native_name = NATIVE_GDMONOCLASS_NAME(native);
if (!ClassDB::is_parent_class(p_this->get_class_name(), native_name)) { if (!ClassDB::is_parent_class(p_this->get_class_name(), native_name)) {
@ -3257,8 +3259,6 @@ ScriptInstance *CSharpScript::instance_create(Object *p_this) {
} }
} }
GD_MONO_SCOPE_THREAD_ATTACH;
Callable::CallError unchecked_error; Callable::CallError unchecked_error;
return _create_instance(nullptr, 0, p_this, Object::cast_to<RefCounted>(p_this) != nullptr, unchecked_error); return _create_instance(nullptr, 0, p_this, Object::cast_to<RefCounted>(p_this) != nullptr, unchecked_error);
} }