Skip to content

Commit c4b7d6f

Browse files
committed
Fix ICU support data loading
This fixes an error in loading the ICU support data on platforms that don't use either the builtin icu4c or the static ICU support data.
1 parent e3213aa commit c4b7d6f

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

modules/text_server_adv/text_server_adv.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -442,6 +442,8 @@ bool TextServerAdvanced::_load_support_data(const String &p_filename) {
442442
}
443443
#else
444444
if (!icu_data_loaded) {
445+
UErrorCode err = U_ZERO_ERROR;
446+
#ifdef ICU_DATA_NAME
445447
String filename = (p_filename.is_empty()) ? String("res://") + _MKSTR(ICU_DATA_NAME) : p_filename;
446448

447449
Ref<FileAccess> f = FileAccess::open(filename, FileAccess::READ);
@@ -451,13 +453,13 @@ bool TextServerAdvanced::_load_support_data(const String &p_filename) {
451453
uint64_t len = f->get_length();
452454
icu_data = f->get_buffer(len);
453455

454-
UErrorCode err = U_ZERO_ERROR;
455456
udata_setCommonData(icu_data.ptr(), &err);
456457
if (U_FAILURE(err)) {
457458
ERR_FAIL_V_MSG(false, u_errorName(err));
458459
}
459460

460461
err = U_ZERO_ERROR;
462+
#endif
461463
u_init(&err);
462464
if (U_FAILURE(err)) {
463465
ERR_FAIL_V_MSG(false, u_errorName(err));

0 commit comments

Comments
 (0)