summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMarcel Krems <m.krems@software-vision.eu>2012-10-21 12:38:39 +0200
committerDaniel Teske <daniel.teske@digia.com>2012-10-22 13:00:18 +0200
commite82918c0a91a55cc45ef54e42de467871d11eae5 (patch)
tree143e671f64cec5e1c9e02d4dc6a26e768cf9c67b /src
parent0753d5e08df7be7755d99599d4fed0aaa160c2e5 (diff)
downloadqt-creator-e82918c0a91a55cc45ef54e42de467871d11eae5.tar.gz
Prevent endless loop if a project with dependencies couldn't be loaded.
Task-number: QTCREATORBUG-8085 Change-Id: I6e09c871cba02360eb93c11b5650683eba652ed0 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/projectexplorer/session.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/projectexplorer/session.cpp b/src/plugins/projectexplorer/session.cpp
index 5324ad7da0..e3901a94fc 100644
--- a/src/plugins/projectexplorer/session.cpp
+++ b/src/plugins/projectexplorer/session.cpp
@@ -719,14 +719,14 @@ void SessionManager::restoreDependencies(const Utils::PersistentSettingsReader &
QMap<QString, QVariant>::const_iterator i = depMap.constBegin();
while (i != depMap.constEnd()) {
const QString &key = i.key();
- if (m_failedProjects.contains(key))
- continue;
- QStringList values;
- foreach (const QString &value, i.value().toStringList()) {
- if (!m_failedProjects.contains(value))
- values << value;
+ if (!m_failedProjects.contains(key)) {
+ QStringList values;
+ foreach (const QString &value, i.value().toStringList()) {
+ if (!m_failedProjects.contains(value))
+ values << value;
+ }
+ m_depMap.insert(key, values);
}
- m_depMap.insert(key, values);
++i;
}
}