oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix deadlock when obtaining the font ID

Browse Source
This commit is contained in:
Marshall Bowers
2023-10-02 16:10:41 -04:00
parent 91582257fb
commit 77e67c19fe
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/gpui3/src/text_system.rs
+3 -1
View File
@@ -50,7 +50,9 @@ impl TextSystem {
} }
pub fn font_id(&self, font: &Font) -> Result<FontId> { pub fn font_id(&self, font: &Font) -> Result<FontId> {
if let Some(font_id) = self.font_ids_by_font.read().get(font).copied() { let font_id = self.font_ids_by_font.read().get(font).copied();
if let Some(font_id) = font_id {
Ok(font_id) Ok(font_id)
} else { } else {
let font_id = self.platform_text_system.font_id(font)?; let font_id = self.platform_text_system.font_id(font)?;