mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-10-27 16:57:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

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
Show stats Download patch file Download diff file Expand all files Collapse all files

4
crates/gpui3/src/text_system.rs
View file

@ -50,7 +50,9 @@ impl TextSystem {
}
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)
} else {
let font_id = self.platform_text_system.font_id(font)?;