mirror of
https://github.com/godotengine/godot
synced 2024-09-05 22:30:46 +00:00
Merge pull request #73669 from bruvzg/icu_static_data
[TextServer] Ensure ICU data is initialised only one and cleaned only at exit.
This commit is contained in:
commit
7e142e04f5
|
@ -334,6 +334,8 @@ _FORCE_INLINE_ bool is_connected_to_prev(char32_t p_chr, char32_t p_pchr) {
|
|||
|
||||
/*************************************************************************/
|
||||
|
||||
bool TextServerAdvanced::icu_data_loaded = false;
|
||||
|
||||
bool TextServerAdvanced::_has_feature(Feature p_feature) const {
|
||||
switch (p_feature) {
|
||||
case FEATURE_SIMPLE_LAYOUT:
|
||||
|
@ -6599,5 +6601,6 @@ TextServerAdvanced::~TextServerAdvanced() {
|
|||
uset_close(allowed);
|
||||
allowed = nullptr;
|
||||
}
|
||||
u_cleanup();
|
||||
|
||||
std::atexit(u_cleanup);
|
||||
}
|
||||
|
|
|
@ -158,7 +158,7 @@ class TextServerAdvanced : public TextServerExtension {
|
|||
|
||||
// ICU support data.
|
||||
|
||||
bool icu_data_loaded = false;
|
||||
static bool icu_data_loaded;
|
||||
mutable USet *allowed = nullptr;
|
||||
mutable USpoofChecker *sc_spoof = nullptr;
|
||||
mutable USpoofChecker *sc_conf = nullptr;
|
||||
|
|
Loading…
Reference in a new issue