Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-20 00:13:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #12549 from neikeq/seriously-do-they

Browse source 
Mono cleanup fixes
This commit is contained in:
Ignacio Etcheverry 2017-11-01 01:56:16 +01:00 • committed by GitHub
commit 3c97a9543d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 22 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
modules/mono/csharp_script.cpp
View file

@ -122,6 +122,9 @@ void CSharpLanguage::init() {
void CSharpLanguage::finish() {
// Release gchandle bindings before finalizing mono runtime
gchandle_bindings.clear();
if (gdmono) {
memdelete(gdmono);
gdmono = NULL;
@ -827,6 +830,14 @@ void *CSharpLanguage::alloc_instance_binding_data(Object *p_object) {
void CSharpLanguage::free_instance_binding_data(void *p_data) {
if (GDMono::get_singleton() == NULL) {
#ifdef DEBUG_ENABLED
CRASH_COND(!gchandle_bindings.empty());
#endif
// Mono runtime finalized, all the gchandle bindings were already released
return;
}
#ifndef NO_THREADS
script_bind_lock->lock();
#endif