PATCH: [ 708893 ] Don't ask to save file compare

diff --git a/Src/MergeDoc.cpp b/Src/MergeDoc.cpp
index da224e5..c2c3a20 100644 (file)
--- a/Src/MergeDoc.cpp
+++ b/Src/MergeDoc.cpp
@@ -929,6 +929,14 @@ BOOL CMergeDoc::CanCloseFrame(CFrameWnd* /*pFrame*/)
        return TRUE;
 }
 
+// If WinMerge is closed, CMainFrame::OnClose already takes
+// care of saving so this function just returns TRUE
+// to prevent further questions
+BOOL CMergeDoc::SaveModified()
+{
+       return TRUE;
+}
+
 void CMergeDoc::SetCurrentDiff(int nDiff)
 {
        if (nDiff >= 0 && nDiff < (int)m_nDiffs)

diff --git a/Src/MergeDoc.h b/Src/MergeDoc.h
index 5fb6aca..1036e6f 100644 (file)
--- a/Src/MergeDoc.h
+++ b/Src/MergeDoc.h
@@ -155,6 +155,7 @@ public:
        virtual BOOL OnNewDocument();
        virtual void Serialize(CArchive& ar);
        virtual BOOL CanCloseFrame(CFrameWnd* pFrame);
+       virtual BOOL SaveModified();
        virtual void DeleteContents ();
        //}}AFX_VIRTUAL
 

diff --git a/Src/readme.txt b/Src/readme.txt
index 0a862bf..aff05e6 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -1,3 +1,7 @@
+2003-03-25 Kimmo
+ PATCH: [ 708893 ] Don't ask to save file compare
+  WinMerge: MergeDoc.h MergeDoc.cpp
+
 2003-03-23 Perry
  PATCH: [ 706006 ] Suppress Rescan during Merge
   Merge.cpp Merge.h MergeDoc.cpp MergeDoc.h MergeEditView.cpp