asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #78157 from RedworkDE/net-shutting-down-abruptly

Browse source 
C#: Fix crash with `DisposablesTracker_OnGodotShuttingDown`
This commit is contained in:
Rémi Verschelde 2023-10-31 20:52:27 +01:00 committed by GitHub
commit 6afd320984
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/mono/csharp_script.cpp
View file

@ -142,6 +142,10 @@ void CSharpLanguage::finalize() {
return; return;
} }
if (gdmono && gdmono->is_runtime_initialized() && GDMonoCache::godot_api_cache_updated) {
GDMonoCache::managed_callbacks.DisposablesTracker_OnGodotShuttingDown();
}
finalizing = true; finalizing = true;
// Make sure all script binding gchandles are released before finalizing GDMono // Make sure all script binding gchandles are released before finalizing GDMono

6
modules/mono/mono_gd/gd_mono.cpp
View file

@ -556,12 +556,6 @@ GDMono::GDMono() {
GDMono::~GDMono() { GDMono::~GDMono() {
finalizing_scripts_domain = true; finalizing_scripts_domain = true;
if (is_runtime_initialized()) {
if (GDMonoCache::godot_api_cache_updated) {
GDMonoCache::managed_callbacks.DisposablesTracker_OnGodotShuttingDown();
}
}
if (hostfxr_dll_handle) { if (hostfxr_dll_handle) {
OS::get_singleton()->close_dynamic_library(hostfxr_dll_handle); OS::get_singleton()->close_dynamic_library(hostfxr_dll_handle);
} }