feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fixed existing backup settings file preventing another backup

Browse Source 
Reviewed-by: Tobias Hunger
This commit is contained in:
Thorbjørn Lindeijer
2010-03-12 12:23:57 +01:00
parent 2a93b5401d
commit 05aefc40cb
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/projectexplorer/userfileaccessor.cpp
View File

@@ -226,7 +226,9 @@ QVariantMap UserFileAccessor::restoreSettings(Project *project)
// Do we need to do a update? // Do we need to do a update?
if (fileVersion != m_lastVersion + 1) { if (fileVersion != m_lastVersion + 1) {
map.insert(QLatin1String(WAS_UPDATED), true); 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: // Update: