BUG: [ 1369646 ] Confusing half-commented lines in DiffFileData::prepAndCompa

  Src: DiffWrapper.cpp

diff --git a/Src/Changes.txt b/Src/Changes.txt
index 2757f8a..e294aff 100644 (file)
--- a/Src/Changes.txt
+++ b/Src/Changes.txt
@@ -8,6 +8,8 @@
   Src: DiffWrapper.cpp DiffWrapper.h MergeDoc.cpp PatchTool.cpp
  PATCH: [ 1392729 ] Cleanup variables in RunFileDiff
   Src: DiffWrapper.cpp
+ BUG: [ 1369646 ] Confusing half-commented lines in DiffFileData::prepAndCompa
+  Src: DiffWrapper.cpp
 
 2005-12-28 Perry
  PATCH: [ 1391732 ] Do not offer to unify codepages in UNICODE build

diff --git a/Src/DiffWrapper.cpp b/Src/DiffWrapper.cpp
index e797898..fd8005d 100644 (file)
--- a/Src/DiffWrapper.cpp
+++ b/Src/DiffWrapper.cpp
@@ -1530,8 +1530,8 @@ int DiffFileData::prepAndCompareTwoFiles(CDiffContext * pCtxt, DIFFITEM &di)
 
        // As we keep handles open on unpacked files, Transform() may not delete them.
        // Unpacked files will be deleted at end of this function.
-       /*diffdata.m_sFilepath[0] = */filepathTransformed1 = filepathUnpacked1;
-       /*diffdata.m_sFilepath[1] = */filepathTransformed2 = filepathUnpacked2;
+       filepathTransformed1 = filepathUnpacked1;
+       filepathTransformed2 = filepathUnpacked2;
        if (!OpenFiles(filepathTransformed1, filepathTransformed2))
        {
                di.errorDesc = _T("OpenFiles Error (before tranform)");