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

Merge pull request #52883 from Germanrc/script_reload_fix 

C# scripts reload in editor fixed
This commit is contained in:
Rémi Verschelde 2021-09-24 08:33:49 +02:00 committed by GitHub
parent 044cafc31a 84a218d346
commit 6e39566344
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
modules/mono/csharp_script.cpp
View File

@ -2707,6 +2707,7 @@ int CSharpScript::_try_get_member_export_hint(IMonoClassMember *p_member, Manage
void CSharpScript::_clear() { void CSharpScript::_clear() {
tool = false; tool = false;
valid = false; valid = false;
reload_invalidated = true;
base = NULL; base = NULL;
native = NULL; native = NULL;
@ -2810,6 +2811,7 @@ void CSharpScript::initialize_for_managed_type(Ref<CSharpScript> p_script, GDMon
p_script->valid = true; p_script->valid = true;
p_script->tool = p_script->script_class->has_attribute(CACHED_CLASS(ToolAttribute)); p_script->tool = p_script->script_class->has_attribute(CACHED_CLASS(ToolAttribute));
p_script->reload_invalidated = false;
if (!p_script->tool) { if (!p_script->tool) {
GDMonoClass *nesting_class = p_script->script_class->get_nesting_class(); GDMonoClass *nesting_class = p_script->script_class->get_nesting_class();
@ -3116,13 +3118,12 @@ MethodInfo CSharpScript::get_method_info(const StringName &p_method) const {
} }
Error CSharpScript::reload(bool p_keep_state) { Error CSharpScript::reload(bool p_keep_state) {
bool has_instances; if (!reload_invalidated) {
{ return OK;
MutexLock lock(CSharpLanguage::get_singleton()->script_instances_mutex);
has_instances = instances.size();
} }
// In the case of C#, reload doesn't really do any script reloading.
ERR_FAIL_COND_V(!p_keep_state && has_instances, ERR_ALREADY_IN_USE); // That's done separately via domain reloading.
reload_invalidated = false;
GD_MONO_SCOPE_THREAD_ATTACH; GD_MONO_SCOPE_THREAD_ATTACH;

1
modules/mono/csharp_script.h
View File

@ -74,6 +74,7 @@ class CSharpScript : public Script {
bool tool; bool tool;
bool valid; bool valid;
bool reload_invalidated;
bool builtin; bool builtin;