Fix potentially evicting glyphs in use during try_allocate

grovesNL · Jul 4, 2023 · 7f31965 · 7f31965
1 parent bc9cc82
commit 7f31965
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/src/text_atlas.rs b/src/text_atlas.rs
@@ -84,12 +84,19 @@ impl InnerAtlas {
             // Try to free least recently used allocation
             let (mut key, mut value) = self.glyph_cache.peek_lru()?;
 
+            // Find a glyph with an actual size
             while value.atlas_id.is_none() {
+                // All sized glyphs are in use, cache is full
+                if self.glyphs_in_use.contains(&key) {
+                    return None;
+                }
+
                 let _ = self.glyph_cache.pop_lru();
 
                 (key, value) = self.glyph_cache.peek_lru()?;
             }
 
+            // All sized glyphs are in use, cache is full
             if self.glyphs_in_use.contains(&key) {
                 return None;
             }