From 7ebfb73a4a9ec05f2d29dab8dae6a6b146f128a4 Mon Sep 17 00:00:00 2001 From: santouits Date: Sun, 28 Jul 2019 23:19:44 +0300 Subject: [PATCH] Hopefully fix the random crashes with threads (cherry picked from commit 13efc1bb062a64d513618b136bfd3d888adb2ec5) --- core/object.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/core/object.h b/core/object.h index e8a6178052c..603f2eadb6c 100644 --- a/core/object.h +++ b/core/object.h @@ -779,8 +779,13 @@ public: static int get_object_count(); _FORCE_INLINE_ static bool instance_validate(Object *p_ptr) { + rw_lock->read_lock(); - return instance_checks.has(p_ptr); + bool exists = instance_checks.has(p_ptr); + + rw_lock->read_unlock(); + + return exists; } };