anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-26 11:16:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

We need to show the error message in the case in which we copied the

Browse Source 
file due to a format change, as well.
This commit is contained in:
Richard Heck 2015-11-15 12:24:37 -05:00
parent 9efa43d2be
commit fb2c558f67
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Buffer.cpp
View File

@ -1333,7 +1333,7 @@ FileName Buffer::getBackupName() const {
v = 1000; v = 1000;
break; break;
} }
string newbackname = backname + "-" + convert<string>(v); string const newbackname = backname + "-" + convert<string>(v);
backup.set(addName(fpath, addExtension(newbackname, fext))); backup.set(addName(fpath, addExtension(newbackname, fext)));
v++; v++;
} }
@ -1401,7 +1401,8 @@ bool Buffer::save() const
bool made_backup = true; bool made_backup = true;
FileName backupName; FileName backupName;
if (lyxrc.make_backup || d->need_format_backup) { bool const needBackup = lyxrc.make_backup || d->need_format_backup;
if (needBackup) {
if (d->need_format_backup) if (d->need_format_backup)
backupName = getBackupName(); backupName = getBackupName();
@ -1458,8 +1459,8 @@ bool Buffer::save() const
} }
// else we saved the file, but failed to move it to the right location. // else we saved the file, but failed to move it to the right location.
if (lyxrc.make_backup && made_backup && !symlink) { if (needBackup && made_backup && !symlink) {
// the original file was moved to filename.lyx~, so it will look // the original file was moved to some new location, so it will look
// to the user as if it was deleted. (see bug #9234.) we could try // to the user as if it was deleted. (see bug #9234.) we could try
// to restore it, but that would basically mean trying to do again // to restore it, but that would basically mean trying to do again
// what we just failed to do. better to leave things as they are. // what we just failed to do. better to leave things as they are.