Commit b01fcdee authored by Orgad Shaneh's avatar Orgad Shaneh Committed by Tobias Hunger

SettingsAccessor: Fall back to shared settings if merge fails

Better than leaving project unconfigured...

Change-Id: I2ee640e7d8320bb75cd0abd99305eb4a3ad5161e
Reviewed-by: default avatarTobias Hunger <tobias.hunger@digia.com>
parent 27421b1a
......@@ -722,7 +722,7 @@ QVariantMap SettingsAccessor::restoreSettings() const
m_project->setProperty(SHARED_SETTINGS, sharedSettings.m_map);
if (settings.isValid())
mergeSharedSettings(&settings.m_map, sharedSettings.m_map);
else
if (!settings.isValid())
settings = sharedSettings;
}
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment