From: Kimmo Varis <kimmov@gmail.com>
Date: Tue, 25 Mar 2003 14:05:39 +0000 (+0000)
Subject: PATCH: [ 708893 ] Don't ask to save file compare
X-Git-Tag: 2.16.5~8079
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=de99b5780d6b7f63eb540e697dcb99800f4ef59c;p=winmerge-jp%2Fwinmerge-jp.git

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

diff --git a/Src/MergeDoc.cpp b/Src/MergeDoc.cpp
index da224e5b1..c2c3a2065 100644
--- 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 5fb6acaef..1036e6ff4 100644
--- 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 0a862bfeb..aff05e66b 100644
--- 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