summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Weisgerber <weisgerber@ms-gmbh.de>2015-01-25 11:47:31 (GMT)
committerKonstantin Ritt <ritt.ks@gmail.com>2015-01-29 04:14:38 (GMT)
commit8960f7356796948b161159cff404a9ebd1624c5f (patch)
tree1cc825b46df33f5771be286aba0484a4e35daf01
parent38fa82e57ceec7a3480261a1658f4b56177fa1a5 (diff)
downloadQt-8960f7356796948b161159cff404a9ebd1624c5f.zip
Qt-8960f7356796948b161159cff404a9ebd1624c5f.tar.gz
Qt-8960f7356796948b161159cff404a9ebd1624c5f.tar.bz2
Added check if fontEngine is still in the cache.
Task-number: QTBUG-22942 Change-Id: I9e4ac72168886769993cb19fac7a370c377ff3af Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
-rw-r--r--src/gui/text/qfontsubset_p.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qfontsubset_p.h b/src/gui/text/qfontsubset_p.h
index 153349d..e6b4f27 100644
--- a/src/gui/text/qfontsubset_p.h
+++ b/src/gui/text/qfontsubset_p.h
@@ -66,7 +66,7 @@ public:
: 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;
}