feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Do not interrupt twice

Browse Source 
Fixes unwanted interrupt after setting a breakpoint to a running
inferior.

Change-Id: I8d24fd4beff53fa74f92d2134866d418745fa747
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2018-10-22 14:48:11 +02:00
parent dbacbffa7c
commit 45666dc932
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/debugger/cdb/cdbengine.cpp
View File

@@ -832,6 +832,7 @@ void CdbEngine::handleDoInterruptInferior(const QString &errorMessage)
void CdbEngine::doInterruptInferior(const InterruptCallback &callback) void CdbEngine::doInterruptInferior(const InterruptCallback &callback)
{ {
const bool requestInterrupt = m_stopMode == NoStopRequested;
if (callback) { if (callback) {
m_interrupCallbacks.push_back(callback); m_interrupCallbacks.push_back(callback);
if (!m_initialSessionIdleHandled) if (!m_initialSessionIdleHandled)
@@ -842,6 +843,8 @@ void CdbEngine::doInterruptInferior(const InterruptCallback &callback)
m_stopMode = Interrupt; m_stopMode = Interrupt;
} }
if (!requestInterrupt)
return; // we already requested a stop no need to interrupt twice
showMessage(QString("Interrupting process %1...").arg(inferiorPid()), LogMisc); showMessage(QString("Interrupting process %1...").arg(inferiorPid()), LogMisc);
QTC_ASSERT(!m_signalOperation, notifyInferiorStopFailed(); return); QTC_ASSERT(!m_signalOperation, notifyInferiorStopFailed(); return);
QTC_ASSERT(device(), notifyInferiorRunFailed(); return); QTC_ASSERT(device(), notifyInferiorRunFailed(); return);