From 1c4849b162151df3f36b0e24d6f9cf70ccbce8ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20J=2E=20Est=C3=A9banez?= Date: Wed, 19 Jun 2024 07:27:33 +0200 Subject: ResourceLoader: Revert workaround resource loading crashes due to buggy TLS This reverts commit 41c07856361d7cf2bcbda6d84386b1a0d3969f6a. (cherry picked from commit e9407d48772e9ed1382f6ccd5a73e6d12465ab2f) --- core/io/resource_loader.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'core/io/resource_loader.h') diff --git a/core/io/resource_loader.h b/core/io/resource_loader.h index 5f1831f0d9..9d07964105 100644 --- a/core/io/resource_loader.h +++ b/core/io/resource_loader.h @@ -188,7 +188,7 @@ private: static thread_local int load_nesting; static thread_local WorkerThreadPool::TaskID caller_task_id; static thread_local HashMap>> res_ref_overrides; // Outermost key is nesting level. - static thread_local Vector *load_paths_stack; // A pointer to avoid broken TLS implementations from double-running the destructor. + static thread_local Vector load_paths_stack; static SafeBinaryMutex thread_load_mutex; static HashMap thread_load_tasks; static bool cleaning_tasks; -- cgit v1.2.3