fix to test plugin filter with left & right filenames (instead of just right one)

diff --git a/Src/Plugins.cpp b/Src/Plugins.cpp
index 98da9c2..32049a4 100644 (file)
--- a/Src/Plugins.cpp
+++ b/Src/Plugins.cpp
@@ -197,7 +197,7 @@ void PluginInfo::LoadFilterString()
        while(1)
        {
                sPiece = sLine.Mid(sLine.ReverseFind(';')+1);
-               sLine = sLine.Left(sLine.ReverseFind(';')-1);
+               sLine = sLine.Left(sLine.ReverseFind(';'));
                if (sPiece.IsEmpty())
                        break;
 
@@ -215,10 +215,27 @@ void PluginInfo::LoadFilterString()
 
 BOOL PluginInfo::TestAgainstRegList(LPCTSTR szTest)
 {
-       if (filters && szTest && szTest[0])
-               return (::TestAgainstRegList(*filters, szTest));
-       else
+       if (filters == NULL || szTest == NULL || szTest[0] == 0)
                return FALSE;
+
+       CString sLine = szTest;
+       CString sPiece;
+
+       while(1)
+       {
+               sPiece = sLine.Mid(sLine.ReverseFind('|')+1);
+               sLine = sLine.Left(sLine.ReverseFind('|'));
+               if (sPiece.IsEmpty())
+                       break;
+
+               sPiece.TrimLeft();
+               sPiece.MakeUpper();
+
+               if (::TestAgainstRegList(*filters, sPiece))
+                       return TRUE;
+       };
+
+       return FALSE;
 }
 
 

diff --git a/Src/readme.txt b/Src/readme.txt
index 8d7e9b4..5f50605 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -1,3 +1,12 @@
+2003-11-04 Laoran
+ fix to test plugin filter with left & right filenames (instead of just right one)
+  WinMerge: Plugins.cpp
+ PATCH: [ 833961 ] Swedish translation 2.1
+ Submitted by Göran Håkansson
+  Languages: BuildAll.bat
+  Languages\Swedish: MergeSwedish.rc MergeSwedish_LastTranslation.rc resource.h
+  Languages\Swedish\res : all files
+
 2003-11-04 Kimmo
  PATCH: [ 831052 ] Write version and configuration info
   WinMerge: MainFrm.h MainFrm.cpp Merge.dsp Merge.rc resource.h