diff options
| author | Tobias Hunger <tobias.hunger@qt.io> | 2018-02-27 16:32:54 +0100 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@qt.io> | 2018-03-05 09:23:58 +0000 |
| commit | bbe7bac2bd4c807d7f6b8a516b21b79a826b1922 (patch) | |
| tree | b2f80bca560eb3d5ce7cc58bf316dac249e3a5eb /src/libs/utils/settingsaccessor.cpp | |
| parent | 3c4e723b9f5cb2bf69061b9380894cf08aaa1dcc (diff) | |
SettingsAccessor: Fix logic to decide when to do a backup
This fixes spurious *.user.-1 files from popping up.
Change-Id: Ia78b99e7c535c085d85673cb310f0806ec4b4fee
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/libs/utils/settingsaccessor.cpp')
| -rw-r--r-- | src/libs/utils/settingsaccessor.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libs/utils/settingsaccessor.cpp b/src/libs/utils/settingsaccessor.cpp index 16fb5c9699..4574d7829a 100644 --- a/src/libs/utils/settingsaccessor.cpp +++ b/src/libs/utils/settingsaccessor.cpp @@ -350,10 +350,10 @@ int VersionedBackUpStrategy::compare(const SettingsAccessor::RestoreData &data1, optional<FileName> VersionedBackUpStrategy::backupName(const QVariantMap &oldData, const FileName &path, const QVariantMap &data) const { - Q_UNUSED(oldData); + Q_UNUSED(data); FileName backupName = path; - const QByteArray oldEnvironmentId = settingsIdFromMap(data); - const int oldVersion = versionFromMap(data); + const QByteArray oldEnvironmentId = settingsIdFromMap(oldData); + const int oldVersion = versionFromMap(oldData); if (!oldEnvironmentId.isEmpty() && oldEnvironmentId != m_accessor->settingsId()) backupName.appendString('.' + QString::fromLatin1(oldEnvironmentId).mid(1, 7)); |