From 84afda857e43f02927cdca3cfe32b056417b9975 Mon Sep 17 00:00:00 2001 From: Niels Martin Hansen Date: Sat, 13 Oct 2007 02:13:51 +0000 Subject: [PATCH] Look for VSFilter.dll in ?data/csri/ first, then ?data/ and then registry. Originally committed to SVN as r1600. --- aegisub/video_provider_avs.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/aegisub/video_provider_avs.cpp b/aegisub/video_provider_avs.cpp index 24791a7a0..96d33d21b 100644 --- a/aegisub/video_provider_avs.cpp +++ b/aegisub/video_provider_avs.cpp @@ -507,7 +507,9 @@ void AvisynthVideoProvider::LoadVSFilter() { AVSTRACE(_T("AvisynthVideoProvider::LoadVSFilter: Loading VSFilter")); // Loading an avisynth plugin multiple times does almost nothing - wxFileName vsfilterPath(StandardPaths::DecodePath(_T("?data/vsfilter.dll"))); + wxFileName vsfilterPath(StandardPaths::DecodePath(_T("?data/csri/vsfilter.dll"))); + if (!vsfilterPath.FileExists()) + vsfilterPath = wxFileName(StandardPaths::DecodePath(_T("?data/vsfilter.dll"))); rendererCallString = _T("TextSub"); if (vsfilterPath.FileExists()) {