From 05aefc40cb6b4902e07b33c15cec21ba7f563314 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= <thorbjorn.lindeijer@nokia.com>
Date: Fri, 12 Mar 2010 12:23:57 +0100
Subject: [PATCH] Fixed existing backup settings file preventing another backup
Reviewed-by: Tobias Hunger
---
src/plugins/projectexplorer/userfileaccessor.cpp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/plugins/projectexplorer/userfileaccessor.cpp b/src/plugins/projectexplorer/userfileaccessor.cpp
index 6d94496c7fc..6b03599a484 100644
--- a/src/plugins/projectexplorer/userfileaccessor.cpp
+++ b/src/plugins/projectexplorer/userfileaccessor.cpp
@@ -226,7 +226,9 @@ QVariantMap UserFileAccessor::restoreSettings(Project *project)
// Do we need to do a update?
if (fileVersion != m_lastVersion + 1) {
map.insert(QLatin1String(WAS_UPDATED), true);
- QFile::copy(fileName, fileName + '.' + m_handlers.value(fileVersion)->displayUserFileVersion());
+ const QString backupFileName = fileName + '.' + m_handlers.value(fileVersion)->displayUserFileVersion();
+ QFile::remove(backupFileName); // Remove because copy doesn't overwrite
+ QFile::copy(fileName, backupFileName);
}
// Update:
--
GitLab