OSDN Git Service
(root)
/
winmerge-jp
/
winmerge-jp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
00476c3
)
[ 686699 ] Check & return file saving success - Fix2
author
Kimmo Varis
<kimmov@gmail.com>
Wed, 26 Feb 2003 17:31:13 +0000
(17:31 +0000)
committer
Kimmo Varis
<kimmov@gmail.com>
Wed, 26 Feb 2003 17:31:13 +0000
(17:31 +0000)
Src/MergeDoc.cpp
patch
|
blob
|
history
diff --git
a/Src/MergeDoc.cpp
b/Src/MergeDoc.cpp
index
062a30c
..
cfc41e9
100644
(file)
--- a/
Src/MergeDoc.cpp
+++ b/
Src/MergeDoc.cpp
@@
-747,8
+747,12
@@
BOOL CMergeDoc::DoSave(LPCTSTR szPath, BOOL &bSaveSuccess, BOOL bLeft)
else
{
// Saving failed, user may save to another location if wants to
+ // TODO: proper fix for handling save success here;
+ // problem is we cannot return bSaveSuccess because callers use
+ // it to determine if file statuses should be changed.
+ BOOL bSaveAsSuccess;
while (!result)
- result = TrySaveAs(strSavePath, bSaveSuccess, bLeft);
+ result = TrySaveAs(strSavePath, bSave
As
Success, bLeft);
}
}
else