summaryrefslogtreecommitdiffstats
path: root/src/gui/opengl/qopengltextureglyphcache.cpp
diff options
context:
space:
mode:
authorLars Knoll <[email protected]>2012-04-30 11:56:45 +0200
committerQt by Nokia <[email protected]>2012-05-01 07:10:34 +0200
commitc56e756aa9d58c6ebce9df2fb4f41ba94afc5b57 (patch)
treede8e8285a48ce19fa86f5df81f65ed62a5f842c0 /src/gui/opengl/qopengltextureglyphcache.cpp
parent715e9caf19387649a42ba3a9706da41b332e4e5d (diff)
Reset pointer to 0 after freeing
set m_textureResource to 0 after freeing it, to ensure we allocate a new one two lines below before using it again 5 lines below. Change-Id: Ib9c4de94aefed91f15d0fab0cd3c774a64f2f891 Reviewed-by: Thiago Macieira <[email protected]> Reviewed-by: Samuel Rødal <[email protected]>
Diffstat (limited to 'src/gui/opengl/qopengltextureglyphcache.cpp')
-rw-r--r--src/gui/opengl/qopengltextureglyphcache.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/opengl/qopengltextureglyphcache.cpp b/src/gui/opengl/qopengltextureglyphcache.cpp
index b37e8fb972c..790b92a686f 100644
--- a/src/gui/opengl/qopengltextureglyphcache.cpp
+++ b/src/gui/opengl/qopengltextureglyphcache.cpp
@@ -106,8 +106,10 @@ void QOpenGLTextureGlyphCache::createTextureData(int width, int height)
if (height < 16)
height = 16;
- if (m_textureResource && !m_textureResource->m_texture)
+ if (m_textureResource && !m_textureResource->m_texture) {
delete m_textureResource;
+ m_textureResource = 0;
+ }
if (!m_textureResource)
m_textureResource = new QOpenGLGlyphTexture(ctx);