Merge remote-tracking branch 'origin/master' into wip/clangwip/clang

Change-Id: I8a2c8068a3f2b15034fb1bf6304c9a0f3f0e3c8f

1 files changed, 12 insertions, 4 deletions

diff --git a/src/plugins/debugger/debuggeritemmanager.cpp b/src/plugins/debugger/debuggeritemmanager.cpp
index cef2fd529a..552018bd98 100644
--- a/src/plugins/debugger/debuggeritemmanager.cpp
+++ b/src/plugins/debugger/debuggeritemmanager.cpp
@@ -433,10 +433,18 @@ void DebuggerItemManager::setItemData(const QVariant &id, const QString &display
     for (int i = 0, n = m_debuggers.size(); i != n; ++i) {
         DebuggerItem &item = m_debuggers[i];
         if (item.id() == id) {
-            item.setDisplayName(displayName);
-            item.setCommand(fileName);
-            item.reinitializeFromFile();
-            emit m_instance->debuggerUpdated(id);
+            bool changed = false;
+            if (item.displayName() != displayName) {
+                item.setDisplayName(displayName);
+                changed = true;
+            }
+            if (item.command() != fileName) {
+                item.setCommand(fileName);
+                item.reinitializeFromFile();
+                changed = true;
+            }
+            if (changed)
+                emit m_instance->debuggerUpdated(id);
             break;
         }
     }