BUG: [ 937435 ] cvs doesn't compile -- typo in CMergeDoc::ShowRescanError(

diff --git a/Src/MergeDoc.cpp b/Src/MergeDoc.cpp
index 2fa61d2..276f703 100644 (file)
--- 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 b5b6a98..e073c9f 100644 (file)
--- 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