BUG: [ 683753 ] Rescan is not prompting to save dirty current file

diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp
index 0b08b12..8b130c7 100644 (file)
--- a/Src/MainFrm.cpp
+++ b/Src/MainFrm.cpp
@@ -253,6 +253,12 @@ void CMainFrame::Dump(CDumpContext& dc) const
 
 void CMainFrame::OnFileOpen() 
 {
+       if (m_pMergeDoc)
+       {
+               // Save files and update dirview status if needed
+               if (!m_pMergeDoc->SaveHelper())
+                       return;
+       }
        DoFileOpen();
 }
 

diff --git a/Src/readme.txt b/Src/readme.txt
index 3f604f3..b326524 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -1,3 +1,9 @@
+2003-02-26 Kimmo
+ BUG: [ 683753 ] Rescan is not prompting to save dirty
+      current file
+  WinMerge:
+   MainFrm.cpp
+
 2003-02-26 Christian
  [ 70970 ] Translate Merge.rc into danish
     BuildAll.bat and added directory Languages/Danish