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:
0612868
)
Fix issue #1326: Backup files: Misleading error message when file cannot be written
author
Takashi Sawanaka
<sdottaka@users.sourceforge.net>
Sat, 21 May 2022 13:37:26 +0000
(22:37 +0900)
committer
Takashi Sawanaka
<sdottaka@users.sourceforge.net>
Sat, 21 May 2022 13:37:26 +0000
(22:37 +0900)
Src/Merge.cpp
patch
|
blob
|
history
diff --git
a/Src/Merge.cpp
b/Src/Merge.cpp
index
848b24d
..
9356899
100644
(file)
--- a/
Src/Merge.cpp
+++ b/
Src/Merge.cpp
@@
-1059,7
+1059,7
@@
bool CMergeApp::CreateBackup(bool bFolder, const String& pszPath)
{
String msg = strutils::format_string1(
_("Unable to backup original file:\n%1\n\nContinue anyway?"),
- pszPath);
+ pszPath
+ _T("\n(\u2192 ") + bakPath + _T(")")
);
if (AfxMessageBox(msg.c_str(), MB_YESNO | MB_ICONWARNING | MB_DONT_ASK_AGAIN, IDS_BACKUP_FAILED_PROMPT) != IDYES)
return false;
}