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

Fix for bug #9234, from Georg.

Browse Source 
Our TempFile class uses QTemporaryFile internally, and, on Windows,
this keeps the file locked so that we cannot rename it. So we have
to release the lock.
This commit is contained in:
Georg Baum 2014-11-03 10:07:17 -05:00 committed by Richard Heck
parent 55b357e0d4
commit 2d338ee3e2
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Buffer.cpp
View File

@ -1300,12 +1300,15 @@ bool Buffer::save() const
// we first write the file to a new name, then move it to its
// proper location once that has been done successfully. that
// way we preserve the original file if something goes wrong.
TempFile tempfile(fileName().onlyPath(), "tmpXXXXXX.lyx");
string const justname = fileName().onlyFileNameWithoutExt();
boost::scoped_ptr<TempFile>
tempfile(new TempFile(fileName().onlyPath(),
justname + "-XXXXXX.lyx"));
bool const symlink = fileName().isSymLink();
if (!symlink)
tempfile.setAutoRemove(false);
tempfile->setAutoRemove(false);
FileName savefile(tempfile.name());
FileName savefile(tempfile->name());
LYXERR(Debug::FILES, "Saving to " << savefile.absFileName());
if (!writeFile(savefile))
return false;
@ -1339,6 +1342,10 @@ bool Buffer::save() const
}
}
// Destroy tempfile since it keeps the file locked on windows (bug 9234)
// Only do this if tempfile is not in autoremove mode
if (!symlink)
tempfile.reset();
// If we have no symlink, we can simply rename the temp file.
// Otherwise, we need to copy it so the symlink stays intact.
if (made_backup && symlink ? savefile.copyTo(fileName(), true) :