Fix bug #11737.

[lyx.git] / src / support / FileName.cpp

diff --git a/src/support/FileName.cpp b/src/support/FileName.cpp
index 5f64bbfe760c68d5130e4716b8d51d9193ad0428..df5b4433813267c69fe07fb69d8b23919c9076c5 100644 (file)
--- a/src/support/FileName.cpp
+++ b/src/support/FileName.cpp
@@ -251,6 +251,7 @@ bool FileName::renameTo(FileName const & name) const
 {
        LYXERR(Debug::FILES, "Renaming " << name << " as " << *this);
        bool success = QFile::rename(d->fi.absoluteFilePath(), name.d->fi.absoluteFilePath());
+       d->refresh();
        if (!success)
                LYXERR0("Could not rename file " << *this << " to " << name);
        return success;
@@ -264,12 +265,13 @@ bool FileName::moveTo(FileName const & name) const
        // there's a locking problem on Windows sometimes, so
        // we will keep trying for five seconds, in the hope
        // that clears.
+       name.refresh();
        if (name.exists()) {
-               bool removed = QFile::remove(name.d->fi.absoluteFilePath());
+               bool removed = name.removeFile();
                int tries = 1;
                while (!removed && tries < 6)   {
                        QThread::sleep(1);
-                       removed = QFile::remove(name.d->fi.absoluteFilePath());
+                       removed = name.removeFile();
                        tries++;
                }
        }
@@ -277,8 +279,7 @@ bool FileName::moveTo(FileName const & name) const
        QFile::remove(name.d->fi.absoluteFilePath());
 #endif
 
-       bool const success = QFile::rename(d->fi.absoluteFilePath(),
-               name.d->fi.absoluteFilePath());
+       bool const success = renameTo(name);
        if (!success)
                LYXERR0("Could not move file " << *this << " to " << name);
        return success;