Debugger: Fix display of location marker when switching perspectives

Fixes: QTCREATORBUG-21362
Change-Id: I9bc1f0931ea902d04ab256774347b63c1fc64262
Reviewed-by: Eike Ziller <eike.ziller@qt.io>

1 files changed, 3 insertions, 11 deletions

diff --git a/src/plugins/debugger/enginemanager.cpp b/src/plugins/debugger/enginemanager.cpp
index 9a14ffaa293..68f800c5b1e 100644
--- a/src/plugins/debugger/enginemanager.cpp
+++ b/src/plugins/debugger/enginemanager.cpp
@@ -337,7 +337,6 @@ void EngineManagerPrivate::activateEngineItem(EngineItem *engineItem)
         if (DebuggerEngine *engine = m_currentItem->m_engine) {
             newContext.add(engine->languageContext());
             newContext.add(engine->debuggerContext());
-            engine->gotoCurrentLocation();
         } else {
             newContext.add(Context(Constants::C_DEBUGGER_NOTRUNNING));
         }
@@ -355,10 +354,8 @@ void EngineManagerPrivate::selectUiForCurrentEngine()
     Perspective *perspective = nullptr;
     int row = 0;
 
-    if (m_currentItem && m_currentItem->m_engine) {
+    if (m_currentItem && m_currentItem->m_engine)
         perspective = m_currentItem->m_engine->perspective();
-        m_currentItem->m_engine->updateState(false);
-    }
 
     if (m_currentItem)
         row = m_engineModel.rootItem()->indexOf(m_currentItem);
@@ -378,19 +375,14 @@ void EngineManagerPrivate::selectUiForCurrentEngine()
     QTC_ASSERT(perspective, return);
     perspective->select();
 
-    m_engineModel.rootItem()->forFirstLevelChildren([](EngineItem *engineItem) {
+    m_engineModel.rootItem()->forFirstLevelChildren([this](EngineItem *engineItem) {
         if (engineItem && engineItem->m_engine)
-            engineItem->m_engine->updateMarkers();
+            engineItem->m_engine->updateUi(engineItem == m_currentItem);
     });
 
     emit theEngineManager->currentEngineChanged();
 }
 
-void EngineManager::selectUiForCurrentEngine()
-{
-    d->selectUiForCurrentEngine();
-}
-
 EngineItem *EngineManagerPrivate::findEngineItem(DebuggerEngine *engine)
 {
     return m_engineModel.rootItem()->findFirstLevelChild([engine](EngineItem *engineItem) {