From 34a4313f742c6907c0b0c26029601e507da96145 Mon Sep 17 00:00:00 2001
From: Artem Sokolovskii <artem.sokolovskii@qt.io>
Date: Thu, 17 Aug 2023 14:50:36 +0200
Subject: [PATCH] DAP: Fix set invalid thread as a current  warning

Change-Id: I39fad868ca8996f51b2b5d8681210d92ec9de76b
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
---
 src/plugins/debugger/dap/dapengine.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/plugins/debugger/dap/dapengine.cpp b/src/plugins/debugger/dap/dapengine.cpp
index 6be4aec835f..180b3bdf1a7 100644
--- a/src/plugins/debugger/dap/dapengine.cpp
+++ b/src/plugins/debugger/dap/dapengine.cpp
@@ -569,8 +569,11 @@ void DapEngine::handleThreadsResponse(const QJsonObject &response)
         handler->updateThread(threadData);
     }
 
-    if (m_currentThreadId)
-        handler->setCurrentThread(threadsHandler()->threadForId(QString::number(m_currentThreadId)));
+    if (m_currentThreadId) {
+        Thread thread = threadsHandler()->threadForId(QString::number(m_currentThreadId));
+        if (thread && thread != threadsHandler()->currentThread())
+            handler->setCurrentThread(thread);
+    }
 }
 
 void DapEngine::handleEvent(DapEventType type, const QJsonObject &event)