diff options
| author | Pedro J. Estébanez <pedrojrulez@gmail.com> | 2024-06-19 07:27:33 +0200 |
|---|---|---|
| committer | Pedro J. Estébanez <pedrojrulez@gmail.com> | 2024-09-05 13:24:16 +0200 |
| commit | 1c4849b162151df3f36b0e24d6f9cf70ccbce8ea (patch) | |
| tree | e583c7eede4051dc07406eef5085b8727ebe86ad /core/io/resource_loader.h | |
| parent | d40fc50f086d14583c7cc979ed4e5363ac223717 (diff) | |
| download | redot-engine-1c4849b162151df3f36b0e24d6f9cf70ccbce8ea.tar.gz | |
ResourceLoader: Revert workaround resource loading crashes due to buggy TLS
This reverts commit 41c07856361d7cf2bcbda6d84386b1a0d3969f6a.
(cherry picked from commit e9407d48772e9ed1382f6ccd5a73e6d12465ab2f)
Diffstat (limited to 'core/io/resource_loader.h')
| -rw-r--r-- | core/io/resource_loader.h | 2 |
1 files changed, 1 insertions, 1 deletions
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<int, HashMap<String, Ref<Resource>>> res_ref_overrides; // Outermost key is nesting level. - static thread_local Vector<String> *load_paths_stack; // A pointer to avoid broken TLS implementations from double-running the destructor. + static thread_local Vector<String> load_paths_stack; static SafeBinaryMutex<BINARY_MUTEX_TAG> thread_load_mutex; static HashMap<String, ThreadLoadTask> thread_load_tasks; static bool cleaning_tasks; |