diff --git a/src/libs/utils/settingsaccessor.cpp b/src/libs/utils/settingsaccessor.cpp index 55e119cf4be..9692fb46dc8 100644 --- a/src/libs/utils/settingsaccessor.cpp +++ b/src/libs/utils/settingsaccessor.cpp @@ -551,11 +551,10 @@ QByteArray SettingsAccessor::settingsIdFromMap(const QVariantMap &data) QVariantMap SettingsAccessor::restoreSettings(QWidget *parent) const { - if (d->lastVersion() < 0) - return QVariantMap(); + QTC_ASSERT(d->lastVersion() >= 0, return QVariantMap()); - QVariantMap userSettings = readUserSettings(parent); - QVariantMap sharedSettings = readSharedSettings(parent); + const QVariantMap userSettings = readUserSettings(parent); + const QVariantMap sharedSettings = readSharedSettings(parent); return mergeSettings(userSettings, sharedSettings); }