summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-11-29 15:37:56 +0000
committerCarl Hetherington <cth@carlh.net>2015-11-29 15:37:56 +0000
commit1c2644f220d356b3a2472f985062d907d7149871 (patch)
treea03e56d489ac846f44d6c0f411480bf06c306fea
parent46778b8ba8819feb21bdce1e6b2d5445959ac514 (diff)
Fix ridiculous thinko causing repeated calls to FcConfigAppFontAddFile and hence memory leak (may fix #766).
-rw-r--r--ChangeLog4
-rw-r--r--src/lib/font_files.cc4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f7961f64e..24aa9973c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-11-29 Carl Hetherington <cth@carlh.net>
+
+ * Possibly fix large memory use with burnt-in subtitles (#766).
+
2015-11-28 Carl Hetherington <cth@carlh.net>
* Version 2.5.11 released.
diff --git a/src/lib/font_files.cc b/src/lib/font_files.cc
index 65b67f7b3..61da986bf 100644
--- a/src/lib/font_files.cc
+++ b/src/lib/font_files.cc
@@ -24,9 +24,9 @@ operator!= (FontFiles const & a, FontFiles const & b)
{
for (int i = 0; i < FontFiles::VARIANTS; ++i) {
if (a.get(static_cast<FontFiles::Variant>(i)) != b.get(static_cast<FontFiles::Variant>(i))) {
- return false;
+ return true;
}
}
- return true;
+ return false;
}