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

Rename emergency file when it is kept.

Browse Source 
Otherwise, we will ask about it again next time, when the file
may have changed. Also, if we crash again, we'll over-write that
file, which we may not want to do.

See bug #11464.
This commit is contained in:
Richard Kimberly Heck 2019-01-16 11:13:53 -05:00
parent a925d25085
commit b804e8851c
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/Buffer.cpp
View File

@ -4770,6 +4770,32 @@ Buffer::ReadStatus Buffer::loadEmergency()
_("&Remove"), _("&Keep")); _("&Remove"), _("&Keep"));
if (del_emerg == 0) if (del_emerg == 0)
emergencyFile.removeFile(); emergencyFile.removeFile();
else {
// See bug #11464
FileName newname;
string const ename = emergencyFile.absFileName();
bool noname = true;
// Surely we can find one in 100 tries?
for (int i = 1; i < 100; ++i) {
newname.set(ename + to_string(i) + ".lyx");
if (!newname.exists()) {
noname = false;
break;
}
}
if (!noname) {
// renameTo returns true on success. So inverting that
// will give us true if we fail.
noname = !emergencyFile.renameTo(newname);
}
if (noname) {
Alert::warning(_("Can't rename emergency file!"),
_("LyX was unable to rename the emergency file. "
"You should do so manually. Otherwise, you will be"
"asked about it again the next time you try to load"
"this file, and may over-write your own work."));
}
}
return ReadOriginal; return ReadOriginal;
} }