From 4af788be1a00f338c85ee82fca5ca01c41ffccbf Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Wed, 20 Oct 2010 01:56:28 +0000 Subject: [PATCH] Fix font collector crash Originally committed to SVN as r4823. --- aegisub/src/font_file_lister_fontconfig.cpp | 2 +- aegisub/src/font_file_lister_freetype.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/aegisub/src/font_file_lister_fontconfig.cpp b/aegisub/src/font_file_lister_fontconfig.cpp index 16c4c9da5..7995979b8 100644 --- a/aegisub/src/font_file_lister_fontconfig.cpp +++ b/aegisub/src/font_file_lister_fontconfig.cpp @@ -70,7 +70,7 @@ wxArrayString FontConfigFontFileLister::DoGetFilesWithFace(wxString facename) { if (FcPatternGetString(final, FC_FILE, 0, &filename) == FcResultMatch && FcPatternGetInteger(final, FC_INDEX, 0, &fontindex) == FcResultMatch) { FcPatternGetString(final, FC_FAMILY, fontindex, &gotfamily); if (strcmp((const char*)gotfamily,buffer) == 0) { - results.Add(wxString((char*) filename,csConvLocal)); + results.Add(wxString((char*) filename)); } } FcPatternDestroy(final); diff --git a/aegisub/src/font_file_lister_freetype.cpp b/aegisub/src/font_file_lister_freetype.cpp index 1dfe64098..aa2c8206b 100644 --- a/aegisub/src/font_file_lister_freetype.cpp +++ b/aegisub/src/font_file_lister_freetype.cpp @@ -93,7 +93,7 @@ wxArrayString GetName(FT_Face &face,int id) { memcpy(str,name.string,name.string_len); str[name.string_len] = 0; str[name.string_len+1] = 0; - if (name.encoding_id == 0) final.Add(wxString(str, csConvLocal)); + if (name.encoding_id == 0) final.Add(wxString(str)); else if (name.encoding_id == 1) { wxMBConvUTF16BE conv; wxString string(str,conv);