From 5b5a7d1deaa77aac0e3c3c3e89523ee9562bc4a6 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Sun, 24 Aug 2014 08:36:07 +0300 Subject: [PATCH] Debugger: Avoid duplication of SDK debuggers Task-number: QTCREATORBUG-12888 Change-Id: I732f1bfe44dc47d0c96570649f3bf8c0e3f40dda Reviewed-by: Tobias Hunger --- src/plugins/debugger/debuggeritemmanager.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/plugins/debugger/debuggeritemmanager.cpp b/src/plugins/debugger/debuggeritemmanager.cpp index 05a6b428ea8..52c1453e378 100644 --- a/src/plugins/debugger/debuggeritemmanager.cpp +++ b/src/plugins/debugger/debuggeritemmanager.cpp @@ -378,18 +378,15 @@ void DebuggerItemManager::saveDebuggers() QVariant DebuggerItemManager::registerDebugger(const DebuggerItem &item) { - // Force addition when Id is set. - if (item.id().isValid()) - return addDebugger(item); - - // Otherwise, try re-using existing item first. + // Try re-using existing item first. foreach (const DebuggerItem &d, m_debuggers) { if (d.command() == item.command() && d.isAutoDetected() == item.isAutoDetected() && d.engineType() == item.engineType() && d.displayName() == item.displayName() - && d.abis() == item.abis()) + && d.abis() == item.abis()) { return d.id(); + } } // Nothing suitable. Create a new id and add the item.