diff options
| author | Jiang Jiang <jiang.jiang@nokia.com> | 2011-03-28 09:03:27 +0200 |
|---|---|---|
| committer | Jiang Jiang <jiang.jiang@nokia.com> | 2011-03-28 09:03:38 +0200 |
| commit | c61d6de8de9aa43ccdd49419b9a03af61cefde73 (patch) | |
| tree | 6f8e99c3d927847e8aeb5ee49881a743bc506a30 /src/gui/text/qfontengine_qpf.cpp | |
| parent | fc7b63d4ca216d4256185aa5d522d02dd27b224c (diff) | |
Fix crash and infinite recursion caused by previous commits
Reviewed-by: TrustMe
Diffstat (limited to 'src/gui/text/qfontengine_qpf.cpp')
| -rw-r--r-- | src/gui/text/qfontengine_qpf.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/text/qfontengine_qpf.cpp b/src/gui/text/qfontengine_qpf.cpp index bfd04e6105..d35bbe506c 100644 --- a/src/gui/text/qfontengine_qpf.cpp +++ b/src/gui/text/qfontengine_qpf.cpp @@ -306,7 +306,8 @@ QFontEngineQPF::QFontEngineQPF(const QFontDef &def, int fileDescriptor, QFontEng glyphMapEntries = 0; glyphDataOffset = 0; glyphDataSize = 0; - glyphFormat = renderingFontEngine->glyphFormat; + if (renderingFontEngine) + glyphFormat = renderingFontEngine->glyphFormat; kerning_pairs_loaded = false; readOnly = true; |