godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-12 13:20:55 +00:00
Code Releases Wiki Activity

Fixed ~CSharpScript() holding on to a mutex longer than necessary, creating potential for a deadlock.

Browse Source
This commit is contained in:
Michael Wörner
2024-01-28 11:46:38 +01:00
parent 17e7f85c06
commit 9d50a486bf
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/mono/csharp_script.cpp
View File

@@ -2855,15 +2855,17 @@ CSharpScript::CSharpScript() {
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
{ {
MutexLock lock(CSharpLanguage::get_singleton()->script_instances_mutex); MutexLock lock(CSharpLanguage::get_singleton()->script_instances_mutex);
CSharpLanguage::get_singleton()->script_list.add(&this->script_list); CSharpLanguage::get_singleton()->script_list.add(&script_list);
} }
#endif #endif
} }
CSharpScript::~CSharpScript() { CSharpScript::~CSharpScript() {
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
{
MutexLock lock(CSharpLanguage::get_singleton()->script_instances_mutex); MutexLock lock(CSharpLanguage::get_singleton()->script_instances_mutex);
CSharpLanguage::get_singleton()->script_list.remove(&this->script_list); CSharpLanguage::get_singleton()->script_list.remove(&script_list);
}
#endif #endif
if (GDMonoCache::godot_api_cache_updated) { if (GDMonoCache::godot_api_cache_updated) {