mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-22 10:00:33 +00:00
Rename emergency file when it is kept.
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.
(cherry picked from commit b804e8851c
)
This commit is contained in:
parent
aa2f5eb426
commit
8cbf1c7cec
@ -4771,6 +4771,32 @@ Buffer::ReadStatus Buffer::loadEmergency()
|
||||
_("&Remove"), _("&Keep"));
|
||||
if (del_emerg == 0)
|
||||
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;
|
||||
}
|
||||
|
||||
|
@ -88,6 +88,8 @@ What's new
|
||||
|
||||
* USER INTERFACE
|
||||
|
||||
- Rename emergency file when user wants to save it (bug 11464).
|
||||
|
||||
- Fix reloading of local layout file (bug 11120).
|
||||
|
||||
- Check for dirty hidden child documents when closing (bug 11405).
|
||||
|
Loading…
Reference in New Issue
Block a user