BUG: [ 1208504 ] Newer right file marked identical comparing by modified date

diff --git a/Src/DirScan.cpp b/Src/DirScan.cpp
index 0cc628e..263e93b 100644 (file)
--- a/Src/DirScan.cpp
+++ b/Src/DirScan.cpp
@@ -256,11 +256,12 @@ int DirScan(const CString & subdir, CDiffContext * pCtxt, bool casesensitive,
                        {
                                // Compare by modified date
                                __int64 nTimeDiff = leftFiles[i].mtime - rightFiles[j].mtime;
+                               // Compare absolute time difference (lose sign)
+                               nTimeDiff = (nTimeDiff > 0 ? nTimeDiff : -nTimeDiff);
                                if (pCtxt->m_bIgnoreSmallTimeDiff)
                                {
                                        // If option to ignore small timediffs (couple of seconds)
                                        // is set, decrease absolute difference by allowed diff
-                                       nTimeDiff = (nTimeDiff > 0 ? nTimeDiff : -nTimeDiff);
                                        nTimeDiff -= SmallTimeDiff;
                                }
                                if (nTimeDiff <= 0)

diff --git a/Src/readme.txt b/Src/readme.txt
index 55562f9..f29225e 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -4,6 +4,8 @@
   Src/Languages: *.rc
  BUG: [ 1198263 ] MergeKorean translation credit wrong?
   Src/Languages/Korean: MergeKorean.rc
+ BUG: [ 1208504 ] Newer right file marked identical comparing by modified date
+  Src: DirScan.cpp
 
 2005-05-26 Jochen
  PATCH: [ 1191245 ] Merge7z DllBuild 0011