Fix ridiculous thinko causing repeated calls to FcConfigAppFontAddFile and hence...

diff --git a/ChangeLog b/ChangeLog
index f7961f64e06e00d46f8ed731388e4376f744ed4f..24aa9973c20597b19b3a5b2a274d608dda2450f5 100644 (file)
--- 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 65b67f7b3765f1a5a63c1cba9d7e27fd1454134b..61da986bf942fe8dab4e8c500aa22cd1b42ec1d5 100644 (file)
--- 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;
 }