diff options
| author | Ignacio Etcheverry <neikeq@users.noreply.github.com> | 2019-03-07 20:50:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-07 20:50:37 +0100 |
| commit | 4c0b0a6bdd3c87220ab0d79ba647d5bdd843ce6c (patch) | |
| tree | 937f0f33962d2ff838c64643f1eceed49f3d552e /modules/mono | |
| parent | d2be02f21e8a16b44af78e72f9910e4640c4e0b1 (diff) | |
| parent | e904f814c83636903bf9de37078d141f3f51c340 (diff) | |
Merge pull request #26765 from neikeq/issue-25959
Mono: Fix crash when re-using script binding after domain reloading
Diffstat (limited to 'modules/mono')
| -rw-r--r-- | modules/mono/csharp_script.cpp | 7 | ||||
| -rw-r--r-- | modules/mono/csharp_script.h | 3 | ||||
| -rw-r--r-- | modules/mono/mono_gd/gd_mono.cpp | 2 |
3 files changed, 12 insertions, 0 deletions
diff --git a/modules/mono/csharp_script.cpp b/modules/mono/csharp_script.cpp index 9bede87f6b..200ab51c7c 100644 --- a/modules/mono/csharp_script.cpp +++ b/modules/mono/csharp_script.cpp @@ -985,6 +985,13 @@ bool CSharpLanguage::debug_break(const String &p_error, bool p_allow_continue) { } } +void CSharpLanguage::_uninitialize_script_bindings() { + for (Map<Object *, CSharpScriptBinding>::Element *E = script_bindings.front(); E; E = E->next()) { + CSharpScriptBinding &script_binding = E->value(); + script_binding.inited = false; + } +} + void CSharpLanguage::set_language_index(int p_idx) { ERR_FAIL_COND(lang_idx != -1); diff --git a/modules/mono/csharp_script.h b/modules/mono/csharp_script.h index 8b1a4b5f7e..e62eac67ab 100644 --- a/modules/mono/csharp_script.h +++ b/modules/mono/csharp_script.h @@ -309,6 +309,9 @@ class CSharpLanguage : public ScriptLanguage { Dictionary scripts_metadata; + friend class GDMono; + void _uninitialize_script_bindings(); + public: StringNameCache string_names; diff --git a/modules/mono/mono_gd/gd_mono.cpp b/modules/mono/mono_gd/gd_mono.cpp index acd8a3b73b..42e70ce635 100644 --- a/modules/mono/mono_gd/gd_mono.cpp +++ b/modules/mono/mono_gd/gd_mono.cpp @@ -848,6 +848,8 @@ Error GDMono::reload_scripts_domain() { } } + CSharpLanguage::get_singleton()->_uninitialize_script_bindings(); + Error err = _load_scripts_domain(); if (err != OK) { ERR_PRINT("Mono: Failed to load scripts domain"); |