From 9a52e1dd634fb0990815ef1d0f79c90140fc2c11 Mon Sep 17 00:00:00 2001
From: con <qtc-committer@nokia.com>
Date: Wed, 2 Feb 2011 17:04:30 +0100
Subject: [PATCH] Some sanity fixes.
---
src/plugins/coreplugin/toolsettings.cpp | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/plugins/coreplugin/toolsettings.cpp b/src/plugins/coreplugin/toolsettings.cpp
index 7748c37e6a1..7ef242d1529 100644
--- a/src/plugins/coreplugin/toolsettings.cpp
+++ b/src/plugins/coreplugin/toolsettings.cpp
@@ -144,7 +144,7 @@ static QString findUnusedId(const QString &proposal, const QMap<QString, QList<E
while (!found && it.hasNext()) {
it.next();
foreach (ExternalTool *tool, it.value()) {
- if (tool->id() == proposal) {
+ if (tool->id() == result) {
found = true;
break;
}
@@ -216,7 +216,8 @@ void ToolSettings::apply()
}
items.append(toolToAdd);
}
- resultMap.insert(it.key(), items);
+ if (!items.isEmpty())
+ resultMap.insert(it.key(), items);
}
ExternalToolManager::instance()->setToolsByCategory(resultMap);
}
--
GitLab