summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjörn Steinbrink <B.Steinbrink@gmx.de>2005-09-28 19:47:01 +0000
committerBjörn Steinbrink <B.Steinbrink@gmx.de>2005-09-28 19:47:01 +0000
commitafaf7b68b8761268fdc54066e02cfe8df1d23dec (patch)
tree3dbe1ffa1b6c7f748807b465132303d588ff63a2
parent208e046a49a1b429dc6a58563874f478c5857778 (diff)
downloadmana-afaf7b68b8761268fdc54066e02cfe8df1d23dec.tar.gz
mana-afaf7b68b8761268fdc54066e02cfe8df1d23dec.tar.bz2
mana-afaf7b68b8761268fdc54066e02cfe8df1d23dec.tar.xz
mana-afaf7b68b8761268fdc54066e02cfe8df1d23dec.zip
Fix deletion of the gui font because of a missing check.
-rw-r--r--ChangeLog2
-rw-r--r--src/gui/browserbox.cpp4
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 216e97d1..71a89494 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@
2005-09-28 Björn Steinbrink <B.Steinbrink@gmx.de>
+ * src/gui/browserbox.cpp: Fix deletion of the gui font because of a
+ missing check.
* src/Makefile.am: Added -Werror to the CXXFLAGS to catch warnings
easier.
* src/gui/error.h: Removed unnecessary ambigous inheritance.
diff --git a/src/gui/browserbox.cpp b/src/gui/browserbox.cpp
index 3c389881..23da7225 100644
--- a/src/gui/browserbox.cpp
+++ b/src/gui/browserbox.cpp
@@ -76,7 +76,9 @@ BrowserBox::~BrowserBox()
{
#ifdef USE_OPENGL
// Clean up static resource font
- delete browserFont;
+ if (config.getValue("opengl", 0)) {
+ delete browserFont;
+ }
#endif
}
}