mirror of
https://github.com/godotengine/godot
synced 2024-09-05 12:08:28 +00:00
Merge pull request #78157 from RedworkDE/net-shutting-down-abruptly
C#: Fix crash with `DisposablesTracker_OnGodotShuttingDown`
This commit is contained in:
commit
6afd320984
|
@ -142,6 +142,10 @@ void CSharpLanguage::finalize() {
|
|||
return;
|
||||
}
|
||||
|
||||
if (gdmono && gdmono->is_runtime_initialized() && GDMonoCache::godot_api_cache_updated) {
|
||||
GDMonoCache::managed_callbacks.DisposablesTracker_OnGodotShuttingDown();
|
||||
}
|
||||
|
||||
finalizing = true;
|
||||
|
||||
// Make sure all script binding gchandles are released before finalizing GDMono
|
||||
|
|
|
@ -556,12 +556,6 @@ GDMono::GDMono() {
|
|||
GDMono::~GDMono() {
|
||||
finalizing_scripts_domain = true;
|
||||
|
||||
if (is_runtime_initialized()) {
|
||||
if (GDMonoCache::godot_api_cache_updated) {
|
||||
GDMonoCache::managed_callbacks.DisposablesTracker_OnGodotShuttingDown();
|
||||
}
|
||||
}
|
||||
|
||||
if (hostfxr_dll_handle) {
|
||||
OS::get_singleton()->close_dynamic_library(hostfxr_dll_handle);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue