diff options
| author | Thaddeus Crews <repiteo@outlook.com> | 2024-11-26 13:04:51 -0600 |
|---|---|---|
| committer | Thaddeus Crews <repiteo@outlook.com> | 2024-11-26 13:04:51 -0600 |
| commit | 0045b1a5135a419daa10b94e42adc220d65fd913 (patch) | |
| tree | 37ec08a76667db0d2d2b0c5808b8e1d1f1478cec /platform | |
| parent | 78b2a53815d1634b71fb414188de397f20a540c4 (diff) | |
| parent | 48fbe4172b682ca319316a1f129f622e240ebad7 (diff) | |
| download | redot-engine-0045b1a5135a419daa10b94e42adc220d65fd913.tar.gz | |
Merge pull request #98862 from HuntJSparra/early-projsettings-registration
Register Engine, OS, ProjectSettings, and Time singletons in time for for `INITIZATION_LEVEL_CORE`
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/windows/os_windows.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp index 984c9ae90e..2b5c77d4b9 100644 --- a/platform/windows/os_windows.cpp +++ b/platform/windows/os_windows.cpp @@ -1528,7 +1528,8 @@ DWRITE_FONT_STRETCH OS_Windows::_stretch_to_dw(int p_stretch) const { } Vector<String> OS_Windows::get_system_font_path_for_text(const String &p_font_name, const String &p_text, const String &p_locale, const String &p_script, int p_weight, int p_stretch, bool p_italic) const { - if (!dwrite2_init) { + // This may be called before TextServerManager has been created, which would cause a crash downstream if we do not check here + if (!dwrite2_init || !TextServerManager::get_singleton()) { return Vector<String>(); } |