From 4cc3489bc02a94e21145d8ec5910d65f591689ee Mon Sep 17 00:00:00 2001
From: Simo Haasanen <48187847+haasanen@users.noreply.github.com>
Date: Thu, 20 Oct 2022 17:47:20 +0100
Subject: [PATCH] Fixes HashMap::erase related race condition in
 WorkerThreadPool when Physics 2D or 3D is selected to run on a separate
 thread.

---
 core/object/worker_thread_pool.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/object/worker_thread_pool.cpp b/core/object/worker_thread_pool.cpp
index 9b3dc6833ea..0218a4c8f65 100644
--- a/core/object/worker_thread_pool.cpp
+++ b/core/object/worker_thread_pool.cpp
@@ -402,7 +402,9 @@ void WorkerThreadPool::wait_for_group_task_completion(GroupID p_group) {
 		}
 	}
 
-	groups.erase(p_group); // Threads do not access this, so safe to erase here.
+	task_mutex.lock(); // This mutex is needed when Physics 2D and/or 3D is selected to run on a separate thread.
+	groups.erase(p_group);
+	task_mutex.unlock();
 }
 
 void WorkerThreadPool::init(int p_thread_count, bool p_use_native_threads_low_priority, float p_low_priority_task_ratio) {