From 3174f995fa1549b04d1a98c843603105934c4511 Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Fri, 22 Oct 2010 18:25:02 +0000
Subject: [PATCH] Prioritize the fontconfig font lister over the freetype one
 when both freetype and fontconfig are available

Originally committed to SVN as r4824.
---
 aegisub/src/font_file_lister.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/aegisub/src/font_file_lister.cpp b/aegisub/src/font_file_lister.cpp
index 9ebdc8e53..01fc16e77 100644
--- a/aegisub/src/font_file_lister.cpp
+++ b/aegisub/src/font_file_lister.cpp
@@ -44,12 +44,12 @@
 #include <wx/tokenzr.h>
 #endif
 
-#ifdef WITH_FREETYPE2
-#include "font_file_lister_freetype.h"
-#define FontListerClass FreetypeFontFileLister
-#elif defined(WITH_FONTCONFIG)
+#ifdef WITH_FONTCONFIG
 #include "font_file_lister_fontconfig.h"
 #define FontListerClass FontConfigFontFileLister
+#elif defined(WITH_FREETYPE2)
+#include "font_file_lister_freetype.h"
+#define FontListerClass FreetypeFontFileLister
 #else
 #include "font_file_lister.h"
 #endif