Added check if fontEngine is still in the cache.

David Weisgerber · KonstantinRitt · commit 8960f7356796 · 2015-01-29T04:14:38.000Z
Task-number: QTBUG-22942
Change-Id: I9e4ac72168886769993cb19fac7a370c377ff3af
Reviewed-by: Konstantin Ritt &lt;ritt.ks@gmail.com&gt;
diff --git a/src/gui/text/qfontsubset_p.h b/src/gui/text/qfontsubset_p.h
@@ -66,7 +66,7 @@ class QFontSubset
         : object_id(obj_id), noEmbed(false), fontEngine(fe), downloaded_glyphs(0), standard_font(false)
         { fontEngine->ref.ref(); addGlyph(0); }
     ~QFontSubset() {
-        if (!fontEngine->ref.deref())
+        if (!fontEngine->ref.deref() && fontEngine->cache_count == 0)
             delete fontEngine;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ class QFontSubset`
`66`	`66`	`: object_id(obj_id), noEmbed(false), fontEngine(fe), downloaded_glyphs(0), standard_font(false)`
`67`	`67`	`{ fontEngine->ref.ref(); addGlyph(0); }`
`68`	`68`	`~QFontSubset() {`
`69`		`- if (!fontEngine->ref.deref())`
	`69`	`+ if (!fontEngine->ref.deref() && fontEngine->cache_count == 0)`
`70`	`70`	`delete fontEngine;`
`71`	`71`	`}`
`72`	`72`