PATCH: [ 1216706 ] Ignore case for project file file-extension

diff --git a/Src/Merge.cpp b/Src/Merge.cpp
index 0afdb5a..a2f676e 100644 (file)
--- a/Src/Merge.cpp
+++ b/Src/Merge.cpp
@@ -797,16 +797,14 @@ BOOL CMergeApp::LoadProjectFile(CStringArray & files, BOOL & recursive)
                return FALSE; // code further down assumes files[0] and files[1] exist
 
        SplitFilename(files[0], NULL, NULL, &ext);
-       if (ext == PROJECTFILE_EXT)
+       if (ext.CompareNoCase(PROJECTFILE_EXT) == 0)
        {
                ProjectFileName = files[0];
        }
        else
        {
-               if (files.GetSize() == 1)
-                       return FALSE;
                SplitFilename(files[1], NULL, NULL, &ext);
-               if (ext == PROJECTFILE_EXT)
+               if (ext.CompareNoCase(PROJECTFILE_EXT) == 0)
                        ProjectFileName = files[1];
                else
                        return FALSE;

diff --git a/Src/readme.txt b/Src/readme.txt
index aa10056..b9a5152 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -1,3 +1,7 @@
+2005-06-08 Kimmo
+ PATCH: [ 1216706 ] Ignore case for project file file-extension
+  Src: Merge.cpp
+
 2005-06-08 Perry
  Remove nonexistent stampver.inf from Merge.dsp
   (No patch because sourceforge.net is unresponsive)