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

Fix bug #10091.

Browse Source 
See the discussion. The decision was just to keep re-trying for a
bit, since the lock preventing us from removing the old file seems
to clear after a bit.
This commit is contained in:
Richard Kimberly Heck 2019-07-07 13:13:52 -04:00
parent d876319e85
commit d96a9aa37f
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/support/FileName.cpp
View File

@ -30,6 +30,10 @@
#include <QTemporaryFile>
#include <QTime>
#ifdef _WIN32
#include <QThread>
#endif
#include <boost/crc.hpp>
#include <algorithm>
@ -263,9 +267,22 @@ bool FileName::renameTo(FileName const & name) const
bool FileName::moveTo(FileName const & name) const
{
LYXERR(Debug::FILES, "Moving " << *this << " to " << name);
#ifdef _WIN32
// there's a locking problem on Windows sometimes, so
// we will keep trying for five seconds, in the hope
// that clears.
bool removed = QFile::remove(name.d->fi.absoluteFilePath());
int tries = 1;
while (!removed && tries < 6) {
QThread::sleep(1);
removed = QFile::remove(name.d->fi.absoluteFilePath());
tries++;
}
#else
QFile::remove(name.d->fi.absoluteFilePath());
#endif
bool success = QFile::rename(d->fi.absoluteFilePath(),
bool const success = QFile::rename(d->fi.absoluteFilePath(),
name.d->fi.absoluteFilePath());
if (!success)
LYXERR0("Could not move file " << *this << " to " << name);