OSDN Git Service

Two unrelated lines got removed by checkin of #909980
authorKimmo Varis <kimmov@gmail.com>
Fri, 5 Mar 2004 09:09:43 +0000 (09:09 +0000)
committerKimmo Varis <kimmov@gmail.com>
Fri, 5 Mar 2004 09:09:43 +0000 (09:09 +0000)
Src/MergeDoc.cpp
Src/readme.txt

index 2a3b0dc..ce831ff 100644 (file)
@@ -2460,6 +2460,7 @@ BOOL CMergeDoc::OpenDocs(CString sLeftFile, CString sRightFile,
                        mf->m_strLeftDesc.Empty();
                }
 
+               m_leftSaveFileInfo.Update(sLeftFile);
                // Load left side file
                nLeftSuccess = LoadFile(sLeftFile, TRUE, bROLeft, cpleft);
        }
@@ -2485,6 +2486,7 @@ BOOL CMergeDoc::OpenDocs(CString sLeftFile, CString sRightFile,
                        mf->m_strRightDesc.Empty();
                }
 
+               m_rightSaveFileInfo.Update(sRightFile);
                if (nLeftSuccess == FRESULT_OK)
                        nRightSuccess = LoadFile(sRightFile, FALSE, bRORight, cpright);
        }
index cc2a41b..109462c 100644 (file)
@@ -1,6 +1,8 @@
 2004-03-05 Kimmo
  PATCH: [ 909980 ] Fix buffer types and descriptions
   Src: MergeDoc.cpp MergeDoc.h
+ Two unrelated lines got removed by checkin of #909980
+  Src: MergeDoc.cpp
 
 2004-03-04 Kimmo
  Fix invalid return in paths_IsPathAbsolute()