diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-10-01 17:31:35 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-10-01 17:31:35 +0200 |
| commit | c73a18adbdd240091287d812f0991a73b86ef9c7 (patch) | |
| tree | 67aa500c576897bd9095467343c1825c36f71970 /modules | |
| parent | 79804a8e77ee9aa8acd2b5fe61977ae884e5ed28 (diff) | |
| parent | c4b7d6f5c32e2a241666233996f20af68107d0ba (diff) | |
| download | redot-engine-c73a18adbdd240091287d812f0991a73b86ef9c7.tar.gz | |
Merge pull request #97648 from twrightsman/fix-icu-load
Fix ICU support data loading
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/text_server_adv/text_server_adv.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/modules/text_server_adv/text_server_adv.cpp b/modules/text_server_adv/text_server_adv.cpp index 3322300dda..e5639744d3 100644 --- a/modules/text_server_adv/text_server_adv.cpp +++ b/modules/text_server_adv/text_server_adv.cpp @@ -442,6 +442,8 @@ bool TextServerAdvanced::_load_support_data(const String &p_filename) { } #else if (!icu_data_loaded) { + UErrorCode err = U_ZERO_ERROR; +#ifdef ICU_DATA_NAME String filename = (p_filename.is_empty()) ? String("res://") + _MKSTR(ICU_DATA_NAME) : p_filename; Ref<FileAccess> f = FileAccess::open(filename, FileAccess::READ); @@ -451,13 +453,13 @@ bool TextServerAdvanced::_load_support_data(const String &p_filename) { uint64_t len = f->get_length(); icu_data = f->get_buffer(len); - UErrorCode err = U_ZERO_ERROR; udata_setCommonData(icu_data.ptr(), &err); if (U_FAILURE(err)) { ERR_FAIL_V_MSG(false, u_errorName(err)); } err = U_ZERO_ERROR; +#endif u_init(&err); if (U_FAILURE(err)) { ERR_FAIL_V_MSG(false, u_errorName(err)); |