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

Merge pull request #16073 from neikeq/AaaaHH

Browse Source 
Mono: Don't defer call to dispose queue objects when finalizing domain
This commit is contained in:
Rémi Verschelde 2018-01-26 07:28:50 +01:00 committed by GitHub
commit a98e9496eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/mono/mono_gd/gd_mono.cpp
View File

@ -696,11 +696,13 @@ bool _GodotSharp::is_domain_loaded() {
return GDMono::get_singleton()->get_scripts_domain() != NULL; return GDMono::get_singleton()->get_scripts_domain() != NULL;
} }
#define ENQUEUE_FOR_DISPOSAL(m_queue, m_inst) \ #define ENQUEUE_FOR_DISPOSAL(m_queue, m_inst) \
m_queue.push_back(m_inst); \ m_queue.push_back(m_inst); \
if (queue_empty) { \ if (queue_empty) { \
queue_empty = false; \ queue_empty = false; \
call_deferred("_dispose_callback"); \ if (!is_finalizing_domain()) { /* call_deferred may not be safe here */ \
call_deferred("_dispose_callback"); \
} \
} }
void _GodotSharp::queue_dispose(MonoObject *p_mono_object, Object *p_object) { void _GodotSharp::queue_dispose(MonoObject *p_mono_object, Object *p_object) {