Merge pull request #85432 from RandomShaper/fix_gds_exit_crash_lower

Fix GDScript thread-exit routine assuming thread-enter was called
godotengine · Nov 27, 2023 · b3a0e07 · b3a0e07
2 parents a807d4b + cfa7e72
commit b3a0e07
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/modules/gdscript/gdscript.cpp b/modules/gdscript/gdscript.cpp
@@ -2106,6 +2106,12 @@ void GDScriptLanguage::thread_enter() {
 }
 
 void GDScriptLanguage::thread_exit() {
+	// This thread may have been created before GDScript was up
+	// (which also means it can't have run any GDScript code at all).
+	if (!GDScript::func_ptrs_to_update_thread_local) {
+		return;
+	}
+
 	GDScript::_fixup_thread_function_bookkeeping();
 
 	bool destroy = false;