[LyX/master] Don't need to remove the file if it doesn't exist. (This would cause a five second delay in that case.)

Richard Kimberly Heck rikiheck at lyx.org
Mon Feb 3 16:19:36 UTC 2020


commit 5188f0fcff49bbbee35193c25b726425c8c02287
Author: Richard Kimberly Heck <rikiheck at lyx.org>
Date:   Mon Feb 3 11:37:12 2020 -0500

    Don't need to remove the file if it doesn't exist. (This would cause a five second delay in that case.)
---
 src/support/FileName.cpp |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/support/FileName.cpp b/src/support/FileName.cpp
index 1c8cc2c..5579446 100644
--- a/src/support/FileName.cpp
+++ b/src/support/FileName.cpp
@@ -272,12 +272,14 @@ 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.
-	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++;
+	if (name.exists()) {
+		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());


More information about the lyx-cvs mailing list