Also remove tokens that we consider "lost" from the list.

Reviewed-by: hjk

1 files changed, 4 insertions, 0 deletions

diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 71b94245dd..0e8439e515 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -3418,8 +3418,12 @@ void GdbEngine::handleDebuggingHelperValue2(const GdbResponse &response)
     // The real dumper might have aborted without giving any answers.
     // Remove traces of the question, too.
     if (m_cookieForToken.contains(response.token - 1)) {
+        m_cookieForToken.remove(response.token - 1);
         debugMessage(_("DETECTING LOST COMMAND %1").arg(response.token - 1));
         --m_pendingRequests;
+        data.setError(WatchData::msgNotInScope());
+        insertData(data);
+        return;
     }
 
     //qDebug() << "CUSTOM VALUE RESULT:" << response.toString();