summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGuillaume Melquiond <guillaume.melquiond@gmail.com>2007-10-18 11:12:42 +0000
committerGuillaume Melquiond <guillaume.melquiond@gmail.com>2007-10-18 11:12:42 +0000
commitd415ba2e8c64e3f8c767fcf56f25a041574704c6 (patch)
tree192ce17a81ed00a09670f90a33e967dc7eacd17e /src
parent546ae9ed020aefae6ee7470a92dff4901eceb53f (diff)
downloadmana-d415ba2e8c64e3f8c767fcf56f25a041574704c6.tar.gz
mana-d415ba2e8c64e3f8c767fcf56f25a041574704c6.tar.bz2
mana-d415ba2e8c64e3f8c767fcf56f25a041574704c6.tar.xz
mana-d415ba2e8c64e3f8c767fcf56f25a041574704c6.zip
Fixed double-free of true-type resources.
Diffstat (limited to 'src')
-rw-r--r--src/gui/truetypefont.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/gui/truetypefont.cpp b/src/gui/truetypefont.cpp
index 7ef29539..bba268c7 100644
--- a/src/gui/truetypefont.cpp
+++ b/src/gui/truetypefont.cpp
@@ -82,15 +82,17 @@ class TextChunk
static std::list<TextChunk> cache;
typedef std::list<TextChunk>::iterator CacheIterator;
+static int fontCounter;
TrueTypeFont::TrueTypeFont(const std::string& filename, int size)
{
- if (!TTF_WasInit() && TTF_Init() == -1)
+ if (fontCounter == 0 && TTF_Init() == -1)
{
throw GCN_EXCEPTION("Unable to initialize SDL_ttf: " +
std::string(TTF_GetError()));
}
+ ++fontCounter;
mFont = TTF_OpenFont(filename.c_str(), size);
if (mFont == NULL)
@@ -103,8 +105,9 @@ TrueTypeFont::TrueTypeFont(const std::string& filename, int size)
TrueTypeFont::~TrueTypeFont()
{
TTF_CloseFont(mFont);
+ --fontCounter;
- if (TTF_WasInit())
+ if (fontCounter == 0)
{
TTF_Quit();
}