From 767644967ca7d342e2d6b7cdd8b3ad4998d28f0a Mon Sep 17 00:00:00 2001 From: David Schulz Date: Wed, 12 Oct 2022 10:42:22 +0200 Subject: [PATCH] Debugger: remove can interrupt check We are now able to interrupt via Ctrl+C so we do not necessarily need a local inferior with a pid. Change-Id: I31997c5d2885b748699756908ef46686798ccafa Reviewed-by: Christian Stenger --- src/plugins/debugger/cdb/cdbengine.cpp | 8 -------- src/plugins/debugger/cdb/cdbengine.h | 1 - 2 files changed, 9 deletions(-) diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp index b0da3a13637..7740d0f0208 100644 --- a/src/plugins/debugger/cdb/cdbengine.cpp +++ b/src/plugins/debugger/cdb/cdbengine.cpp @@ -611,9 +611,6 @@ void CdbEngine::shutdownInferior() if (commandsPending()) { showMessage("Cannot shut down inferior due to pending commands.", LogWarning); STATE_DEBUG(state(), Q_FUNC_INFO, __LINE__, "notifyInferiorShutdownFinished") - } else if (!canInterruptInferior()) { - showMessage("Cannot interrupt the inferior.", LogWarning); - STATE_DEBUG(state(), Q_FUNC_INFO, __LINE__, "notifyInferiorShutdownFinished") } else { interruptInferior(); // Calls us again return; @@ -758,11 +755,6 @@ void CdbEngine::doContinueInferior() runCommand({"g", NoFlags}); } -bool CdbEngine::canInterruptInferior() const -{ - return m_effectiveStartMode != AttachToRemoteServer && inferiorPid(); -} - void CdbEngine::interruptInferior() { if (debug) diff --git a/src/plugins/debugger/cdb/cdbengine.h b/src/plugins/debugger/cdb/cdbengine.h index 4f3786bc631..27a3cd3d410 100644 --- a/src/plugins/debugger/cdb/cdbengine.h +++ b/src/plugins/debugger/cdb/cdbengine.h @@ -129,7 +129,6 @@ private: void doContinueInferior(); void parseOutputLine(QString line); bool isCdbProcessRunning() const { return m_process.state() != QProcess::NotRunning; } - bool canInterruptInferior() const; inline void postDisassemblerCommand(quint64 address, DisassemblerAgent *agent); void postDisassemblerCommand(quint64 address, quint64 endAddress, DisassemblerAgent *agent);