From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 30 Dec 2001 17:28:12 +0000 (+0000)
Subject: wxDocument::SaveAs sets m_savedYet flag correctly (patch 494838)
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/d06a66f52670ed5258b6a1dcf52ed5cd3a06ae1a?ds=sidebyside

wxDocument::SaveAs sets m_savedYet flag correctly (patch 494838)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13247 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/common/docview.cpp b/src/common/docview.cpp
index 7588bcdd81..95b9f93b46 100644
--- a/src/common/docview.cpp
+++ b/src/common/docview.cpp
@@ -227,16 +227,13 @@ bool wxDocument::OnNewDocument()
 
 bool wxDocument::Save()
 {
-    bool ret = FALSE;
+    if (!IsModified() && m_savedYet)
+        return TRUE;
 
-    if (!IsModified() && m_savedYet) return TRUE;
-    if (m_documentFile == wxT("") || !m_savedYet)
-        ret = SaveAs();
-    else
-        ret = OnSaveDocument(m_documentFile);
-    if ( ret )
-        SetDocumentSaved(TRUE);
-    return ret;
+    if ( m_documentFile.empty() || !m_savedYet )
+        return SaveAs();
+
+    return OnSaveDocument(m_documentFile);
 }
 
 bool wxDocument::SaveAs()
@@ -316,6 +313,7 @@ bool wxDocument::OnSaveDocument(const wxString& file)
     }
     Modify(FALSE);
     SetFilename(file);
+    SetDocumentSaved(TRUE);
     return TRUE;
 }