From 3a4f59991b7f33c96fe6ba76b0023367a7972244 Mon Sep 17 00:00:00 2001 From: Rodrigo Braz Monteiro Date: Thu, 23 Feb 2006 20:29:23 +0000 Subject: [PATCH] Fixed Fonts Collector behavior with font shortcuts. Originally committed to SVN as r128. --- core/changelog.txt | 1 + core/fonts_collector.cpp | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/core/changelog.txt b/core/changelog.txt index 09354d4c5..10660797c 100644 --- a/core/changelog.txt +++ b/core/changelog.txt @@ -48,6 +48,7 @@ Please visit http://aegisub.net to download latest version - Now requires Avisynth 2.5.6a or later, added an option ("allow ancient avisynth") to override it to config.dat. (Myrsloik) - Added reading of keyframe and timecode data from Matroska files (which are still not recommended, due to their dependency on DirectShowSource). (AMZ) - Added forums and bugtracker to Help menu. (AMZ) +- Fixed Fonts Collector behavior with font shortcuts. (AMZ) = 1.09 beta - 2006.01.16 =========================== diff --git a/core/fonts_collector.cpp b/core/fonts_collector.cpp index a81167735..37a44ccd6 100644 --- a/core/fonts_collector.cpp +++ b/core/fonts_collector.cpp @@ -360,8 +360,16 @@ void FontsCollectorThread::Collect() { // Copy else { - wxString srcFile = source + work[j]; + // Get path to font file + wxString srcFile; + wxFileName srcFileName(work[j]); + if (srcFileName.FileExists() && srcFileName.IsAbsolute()) srcFile = work[j]; + else srcFile = source + work[j]; + + // Copy font bool success = Copy(srcFile,dstFile); + + // Report wxMutexGuiEnter(); if (success) { LogBox->SetDefaultStyle(wxTextAttr(wxColour(0,180,0)));