summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2022-06-13 10:20:58 +0200
committerGitHub <noreply@github.com>2022-06-13 10:20:58 +0200
commit2e58dcc150188b6f4257dbde21aa12e9a5bab49e (patch)
tree178a346838d018f1a2ac66daac0557461b561ee9
parent803d25a20a80de6e3532c6f85a6b54c22c19c305 (diff)
parentb667469bbfcbd1f16e28dc757b552a7a149c728e (diff)
Merge pull request #61986 from bruvzg/missing_ts_lock
-rw-r--r--modules/text_server_adv/text_server_adv.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/modules/text_server_adv/text_server_adv.cpp b/modules/text_server_adv/text_server_adv.cpp
index d18ed97def..3573e200e8 100644
--- a/modules/text_server_adv/text_server_adv.cpp
+++ b/modules/text_server_adv/text_server_adv.cpp
@@ -4780,6 +4780,9 @@ void TextServerAdvanced::_shape_run(ShapedTextDataAdvanced *p_sd, int64_t p_star
RID f = p_fonts[p_fb_index];
FontDataAdvanced *fd = font_owner.get_or_null(f);
+ ERR_FAIL_COND(!fd);
+ MutexLock lock(fd->mutex);
+
Vector2i fss = _get_size(fd, fs);
hb_font_t *hb_font = _font_get_hb_handle(f, fs);
double scale = font_get_scale(f, fs);