BUG [ 925202 ] broken feature: after save error, save with another filename

diff --git a/Src/MergeDoc.cpp b/Src/MergeDoc.cpp
index fe0a7a3..be5e553 100644 (file)
--- a/Src/MergeDoc.cpp
+++ b/Src/MergeDoc.cpp
@@ -936,8 +936,10 @@ BOOL CMergeDoc::DoSave(LPCTSTR szPath, BOOL &bSaveSuccess, BOOL bLeft)
                        nSaveErrorCode = SAVE_NO_FILENAME;
 
        if (nSaveErrorCode == SAVE_DONE)
+               // We have a filename, just try to save
                nSaveErrorCode = pBuffer->SaveToFile(strSavePath, FALSE, &infoTempUnpacker);
-       else
+
+       if (nSaveErrorCode != SAVE_DONE)
        {
                // Saving failed, user may save to another location if wants to
                do

diff --git a/Src/readme.txt b/Src/readme.txt
index 9ee90b7..da95321 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -1,3 +1,7 @@
+2004-03-30 Laoran
+ BUG [ 925202 ] broken feature: after save error, save with another filename
+  Src: MergeDoc.cpp
+
 2004-03-28 Kimmo
  PATCH: [ 913743 ] Icons for menuitems (RFE 873697)
   File/Exit and Help/Contents icons from Tim Gerundt