forked from qt-creator/qt-creator
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>
This commit is contained in:
committed by
Daniel Teske
parent
0753d5e08d
commit
e82918c0a9
@@ -719,14 +719,14 @@ void SessionManager::restoreDependencies(const Utils::PersistentSettingsReader &
|
|||||||
QMap<QString, QVariant>::const_iterator i = depMap.constBegin();
|
QMap<QString, QVariant>::const_iterator i = depMap.constBegin();
|
||||||
while (i != depMap.constEnd()) {
|
while (i != depMap.constEnd()) {
|
||||||
const QString &key = i.key();
|
const QString &key = i.key();
|
||||||
if (m_failedProjects.contains(key))
|
if (!m_failedProjects.contains(key)) {
|
||||||
continue;
|
QStringList values;
|
||||||
QStringList values;
|
foreach (const QString &value, i.value().toStringList()) {
|
||||||
foreach (const QString &value, i.value().toStringList()) {
|
if (!m_failedProjects.contains(value))
|
||||||
if (!m_failedProjects.contains(value))
|
values << value;
|
||||||
values << value;
|
}
|
||||||
|
m_depMap.insert(key, values);
|
||||||
}
|
}
|
||||||
m_depMap.insert(key, values);
|
|
||||||
++i;
|
++i;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user