From e21337f34f127538f7b043883fe441edcc7421b9 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Fri, 24 Jul 2009 02:30:11 +0000 Subject: [PATCH] Made it so that the font collector does not crash Aegisub when it is built with both no freetype and no fontconfig. Originally committed to SVN as r3252. --- aegisub/src/dialog_fonts_collector.cpp | 2 +- aegisub/src/font_file_lister.cpp | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/aegisub/src/dialog_fonts_collector.cpp b/aegisub/src/dialog_fonts_collector.cpp index e3e15b8db..d20e79588 100644 --- a/aegisub/src/dialog_fonts_collector.cpp +++ b/aegisub/src/dialog_fonts_collector.cpp @@ -589,7 +589,7 @@ bool FontsCollectorThread::AttachFont(wxString filename) { // Get fonts from ass overrides void FontsCollectorThread::GetFonts (wxString tagName,int par_n,AssOverrideParameter *param,void *usr) { if (tagName == _T("\\fn")) { - instance->AddFont(param->AsText(),1); + if (instance) instance->AddFont(param->AsText(),1); } } diff --git a/aegisub/src/font_file_lister.cpp b/aegisub/src/font_file_lister.cpp index 91a46e418..73dbb25ad 100644 --- a/aegisub/src/font_file_lister.cpp +++ b/aegisub/src/font_file_lister.cpp @@ -85,15 +85,20 @@ void FontFileLister::GetInstance() { // Redirect statics to the instance wxArrayString FontFileLister::GetFilesWithFace(wxString facename) { GetInstance(); - return instance->DoGetFilesWithFace(facename); + if (instance) + return instance->DoGetFilesWithFace(facename); + else { + wxArrayString ret; + return ret; + } } void FontFileLister::Initialize() { GetInstance(); - instance->DoInitialize(); + if (instance) instance->DoInitialize(); } void FontFileLister::ClearData() { GetInstance(); - instance->DoClearData(); + if (instance) instance->DoClearData(); }