From e23c7e4207f2fd37efcebfa2c7c9f767e9dd7569 Mon Sep 17 00:00:00 2001 From: Perry Rapp Date: Sun, 18 Apr 2004 18:45:58 +0000 Subject: [PATCH] BUG: [ 937435 ] cvs doesn't compile -- typo in CMergeDoc::ShowRescanError( --- Src/MergeDoc.cpp | 4 ++-- Src/readme.txt | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Src/MergeDoc.cpp b/Src/MergeDoc.cpp index 2fa61d2eb..276f703d6 100644 --- a/Src/MergeDoc.cpp +++ b/Src/MergeDoc.cpp @@ -465,8 +465,8 @@ void CMergeDoc::ShowRescanError(int nRescanResult) break; case RESCAN_TEMP_ERR: - VERIFY(msg.LoadString(IDS_TEMP_FILEERROR)); - AfxMessageBox(msg, MB_ICONSTOP); + VERIFY(s.LoadString(IDS_TEMP_FILEERROR)); + AfxMessageBox(s, MB_ICONSTOP); break; } } diff --git a/Src/readme.txt b/Src/readme.txt index b5b6a98d5..e073c9fae 100644 --- a/Src/readme.txt +++ b/Src/readme.txt @@ -1,3 +1,7 @@ +2004-04-18 Perry + BUG: [ 937435 ] cvs doesn't compile -- typo in CMergeDoc::ShowRescanError( + Src: MergeDoc.cpp + 2004-04-18 Kimmo PATCH: [ 934738 ] CopyLeftTo/CopyRightTo Including Common Subdirectories Submitted by Ben (?) - some modifications by Kimmo -- 2.11.0