diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2012-12-12 17:56:15 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@digia.com> | 2012-12-12 17:00:34 +0100 |
| commit | b01fcdee4a3f842540b5fb8640f3b5881bb38afa (patch) | |
| tree | d58d446a7dad495f4281b001104746b180b927fc /src | |
| parent | 27421b1a81b0c2a472ad7a88082aa24a943e8917 (diff) | |
SettingsAccessor: Fall back to shared settings if merge fails
Better than leaving project unconfigured...
Change-Id: I2ee640e7d8320bb75cd0abd99305eb4a3ad5161e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/projectexplorer/settingsaccessor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/projectexplorer/settingsaccessor.cpp b/src/plugins/projectexplorer/settingsaccessor.cpp index 696445ddbe..c4effbd9d1 100644 --- a/src/plugins/projectexplorer/settingsaccessor.cpp +++ b/src/plugins/projectexplorer/settingsaccessor.cpp @@ -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; } } |